Skip to content

Commit 485c793

Browse files
firewavefirewave
committed
updated Qt to 6.9.0
1 parent 04c885d commit 485c793

11 files changed

+28
-23
lines changed

‎.github/workflows/CI-unixish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,9 @@ jobs:
547547
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --enable=internal lib || ec=1
548548
# check gui with qt settings
549549
mkdir b2
550-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui || ec=1
550+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui || ec=1
551551
# self check test and tools
552552
./cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
553553
# triage
554-
./cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
554+
./cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
555555
exit $ec

‎.github/workflows/CI-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: [windows-2019, windows-2022]
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

+3-3
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
@@ -146,7 +146,7 @@ jobs:
146146
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
147147
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
148148
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
149-
./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
149+
./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
150150
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
151-
./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
151+
./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
152152
exit $ec

‎.github/workflows/clang-tidy.yml

+1-1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
image: ${{ matrix.image }}
3636

3737
env:
38-
QT_VERSION: 6.8.2
38+
QT_VERSION: 6.9.0
3939

4040
steps:
4141
- uses: actions/checkout@v4
@@ -164,7 +164,7 @@ jobs:
164164
if: ${{ github.repository_owner == 'danmar' }}
165165

166166
env:
167-
QT_VERSION: 6.8.2
167+
QT_VERSION: 6.9.0
168168

169169
steps:
170170
- uses: actions/checkout@v4

‎.github/workflows/release-windows.yml

+1-1
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

+5-5
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
@@ -79,7 +79,7 @@ jobs:
7979
- name: Self check (unusedFunction)
8080
if: false # TODO: fails with preprocessorErrorDirective - see #10667
8181
run: |
82-
./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
82+
./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
8383
env:
8484
DISABLE_VALUEFLOW: 1
8585
UNUSEDFUNCTION_ONLY: 1
@@ -104,7 +104,7 @@ jobs:
104104
# TODO: find a way to report unmatched suppressions without need to add information checks
105105
- name: Self check (unusedFunction / no test)
106106
run: |
107-
./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
107+
./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
108108
env:
109109
DISABLE_VALUEFLOW: 1
110110
UNUSEDFUNCTION_ONLY: 1
@@ -147,7 +147,7 @@ jobs:
147147
- name: Self check (unusedFunction / no test / no cli)
148148
if: false # TODO: the findings are currently too intrusive
149149
run: |
150-
./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
150+
./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
151151
env:
152152
DISABLE_VALUEFLOW: 1
153153
UNUSEDFUNCTION_ONLY: 1
@@ -175,7 +175,7 @@ jobs:
175175
- name: Self check (unusedFunction / corpus / no test / callgrind)
176176
run: |
177177
# TODO: fix -rp so the suppressions actually work
178-
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)
178+
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)
179179
cat callgrind.log
180180
callgrind_annotate --auto=no > callgrind.annotated.log
181181
head -50 callgrind.annotated.log

‎.github/workflows/tsan.yml

+3-3
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
@@ -149,7 +149,7 @@ jobs:
149149
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
150150
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
151151
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
152-
./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
152+
./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
153153
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
154-
./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
154+
./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
155155
exit $ec

‎.github/workflows/ubsan.yml

+3-3
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
@@ -143,7 +143,7 @@ jobs:
143143
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
144144
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
145145
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
146-
./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
146+
./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
147147
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
148-
./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
148+
./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
149149
exit $ec

‎gui/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,14 @@ 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()
79-
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
83+
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
85+
# QtCharts/qxyseries.h fails to compile in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135637
8186
target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
8287
endif()
8388
target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH)

‎releasenotes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Deprecations:
1717
-
1818

1919
Other:
20-
- Updated Qt to 6.8.2 (official Windows release only).
20+
- Updated Qt to 6.9.0 (official Windows release only).
2121
- added CMake target `run-clang-tidy-csa` to run Clang Static Analyzer
2222
- added CMake option `ENABLE_CSA_ALPHA` to enable the Clang Static Analyzer alpha checkers
2323
-

0 commit comments

Comments
 (0)