Skip to content

Commit 00ce4eb

Browse files
committed
adjusted suppressions for differences in generated Qt code between versions
1 parent 53eccaf commit 00ce4eb

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

.github/workflows/CI-unixish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
5959
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
6060
gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
61+
gui_options="$gui_options --suppress=simplifyUsing:*/moc_*.cpp"
6162
ec=0
6263
6364
# TODO: add --check-config

.github/workflows/ubsan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
9595
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
9696
gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
97+
gui_options="$gui_options --suppress=autoNoType:*/moc_*.cpp --suppress=constVariablePointer:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
9798
ec=0
9899
#./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
99100
#./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1

.selfcheck_suppressions

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ checkersReport
55
# temporary suppressions - fix the warnings!
66
simplifyUsing:lib/valueptr.h
77
naming-privateMemberVariable:gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
8-
simplifyUsing:*/moc_checkthread.cpp
9-
simplifyUsing:*/moc_codeeditstylecontrols.cpp
10-
simplifyUsing:*/moc_resultstree.cpp
11-
simplifyUsing:*/moc_resultsview.cpp
12-
simplifyUsing:*/moc_threadhandler.cpp
13-
simplifyUsing:*/moc_threadresult.cpp
148
bitwiseOnBoolean:lib/library.cpp
159
templateInstantiation:lib/checkunusedfunctions.cpp
1610
templateInstantiation:lib/errorlogger.cpp

0 commit comments

Comments
 (0)