Skip to content

Commit 5147b19

Browse files
firewavefirewave
authored
fixed #13853 - updated Qt to 6.9.0 (danmar#7433)
1 parent eb63337 commit 5147b19

File tree

17 files changed

+52
-20
lines changed

17 files changed

+52
-20
lines changed

‎.github/workflows/CI-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: [windows-2022, windows-2025]
30-
qt_ver: [5.15.2, 6.8.2]
30+
qt_ver: [5.15.2, 6.9.0]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}

‎.github/workflows/asan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222

2323
env:
24-
QT_VERSION: 6.8.2
24+
QT_VERSION: 6.9.0
2525
ASAN_OPTIONS: detect_stack_use_after_return=1
2626
# TODO: figure out why there are cache misses with PCH enabled
2727
CCACHE_SLOPPINESS: pch_defines,time_macros
@@ -147,7 +147,7 @@ jobs:
147147
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
148148
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
149149
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
150-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
150+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
151151
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
152-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
152+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
153153
exit $ec

‎.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-22.04
2525

2626
env:
27-
QT_VERSION: 6.8.2
27+
QT_VERSION: 6.9.0
2828

2929
steps:
3030
- uses: actions/checkout@v4

‎.github/workflows/iwyu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
image: ${{ matrix.image }}
3737

3838
env:
39-
QT_VERSION: 6.8.2
39+
QT_VERSION: 6.9.0
4040

4141
steps:
4242
- uses: actions/checkout@v4
@@ -184,7 +184,7 @@ jobs:
184184
if: ${{ github.repository_owner == 'danmar' }}
185185

186186
env:
187-
QT_VERSION: 6.8.2
187+
QT_VERSION: 6.9.0
188188

189189
steps:
190190
- uses: actions/checkout@v4

‎.github/workflows/release-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
# see https://www.pcre.org/original/changelog.txt
2929
PCRE_VERSION: 8.45
30-
QT_VERSION: 6.8.2
30+
QT_VERSION: 6.9.0
3131

3232
steps:
3333
- uses: actions/checkout@v4

‎.github/workflows/selfcheck.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222

2323
env:
24-
QT_VERSION: 6.8.2
24+
QT_VERSION: 6.9.0
2525

2626
steps:
2727
- uses: actions/checkout@v4
@@ -80,7 +80,7 @@ jobs:
8080
- name: Self check (unusedFunction)
8181
if: false # TODO: fails with preprocessorErrorDirective - see #10667
8282
run: |
83-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
83+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
8484
env:
8585
DISABLE_VALUEFLOW: 1
8686
UNUSEDFUNCTION_ONLY: 1
@@ -105,7 +105,7 @@ jobs:
105105
# TODO: find a way to report unmatched suppressions without need to add information checks
106106
- name: Self check (unusedFunction / no test)
107107
run: |
108-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
108+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
109109
env:
110110
DISABLE_VALUEFLOW: 1
111111
UNUSEDFUNCTION_ONLY: 1
@@ -148,7 +148,7 @@ jobs:
148148
- name: Self check (unusedFunction / no test / no cli)
149149
if: false # TODO: the findings are currently too intrusive
150150
run: |
151-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
151+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
152152
env:
153153
DISABLE_VALUEFLOW: 1
154154
UNUSEDFUNCTION_ONLY: 1
@@ -176,7 +176,7 @@ jobs:
176176
- name: Self check (unusedFunction / corpus / no test / callgrind)
177177
run: |
178178
# TODO: fix -rp so the suppressions actually work
179-
valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
179+
valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
180180
cat callgrind.log
181181
callgrind_annotate --auto=no > callgrind.annotated.log
182182
head -50 callgrind.annotated.log

‎.github/workflows/tsan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222

2323
env:
24-
QT_VERSION: 6.8.2
24+
QT_VERSION: 6.9.0
2525
TSAN_OPTIONS: halt_on_error=1
2626
# TODO: figure out why there are cache misses with PCH enabled
2727
CCACHE_SLOPPINESS: pch_defines,time_macros
@@ -150,7 +150,7 @@ jobs:
150150
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
151151
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
152152
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
153-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
153+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
154154
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
155-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
155+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
156156
exit $ec

‎.github/workflows/ubsan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222

2323
env:
24-
QT_VERSION: 6.8.2
24+
QT_VERSION: 6.9.0
2525
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1
2626
# TODO: figure out why there are cache misses with PCH enabled
2727
CCACHE_SLOPPINESS: pch_defines,time_macros
@@ -144,7 +144,7 @@ jobs:
144144
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
145145
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
146146
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
147-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
147+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
148148
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
149-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
149+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
150150
exit $ec

‎gui/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ CheckOptions:
7575
# caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915
7676
target_compile_options_safe(cppcheck-gui -Wno-redundant-parens)
7777
endif()
78+
if(QT_VERSION VERSION_EQUAL "6.9.0")
79+
# caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
80+
target_compile_options_safe(cppcheck-gui -Wno-ctad-maybe-unsupported)
81+
endif()
7882
endif()
7983
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.1")
8084
# QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038

‎gui/test/cppchecklibrarydata/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1717
# Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
1818
target_compile_options_safe(test-cppchecklibrarydata -Wno-extra-semi-stmt)
1919
endif()
20+
if(QT_VERSION VERSION_EQUAL "6.9.0")
21+
# caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
22+
target_compile_options_safe(test-cppchecklibrarydata -Wno-ctad-maybe-unsupported)
23+
endif()
2024
endif()
2125

2226
if (REGISTER_GUI_TESTS)

0 commit comments

Comments
 (0)