diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index e07cedbc9f3..6117072ee42 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [windows-2022, windows-2025] - qt_ver: [5.15.2, 6.9.0] + qt_ver: [5.15.2, 6.9.1] fail-fast: false runs-on: ${{ matrix.os }} diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 2609007b391..f2c4f2cdd1b 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 ASAN_OPTIONS: detect_stack_use_after_return=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 9f854cbad6f..40079ad4422 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 316380a50b4..5de821030ac 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -39,7 +39,7 @@ jobs: image: ${{ matrix.image }} env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 steps: - uses: actions/checkout@v4 @@ -186,7 +186,7 @@ jobs: if: ${{ github.repository_owner == 'danmar' }} env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index eb2b9e3c4a0..afc6643e268 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -27,7 +27,7 @@ jobs: env: # see https://www.pcre.org/original/changelog.txt PCRE_VERSION: 8.45 - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml index 8e0c3859522..d58178a5c1a 100644 --- a/.github/workflows/selfcheck.yml +++ b/.github/workflows/selfcheck.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 5243361dd85..4347e5e1b98 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 TSAN_OPTIONS: halt_on_error=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index b36e275ba07..11dc26a8ec3 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.0 + QT_VERSION: 6.9.1 UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index fdf154b270a..143f96620b9 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -75,15 +75,15 @@ CheckOptions: # caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915 target_compile_options_safe(cppcheck-gui -Wno-redundant-parens) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(cppcheck-gui -Wno-ctad-maybe-unsupported) endif() endif() - if(QT_VERSION VERSION_GREATER_EQUAL "6.9.1") + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.2") # QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038 - # QtCharts/qxyseries.h fails to compile in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135637 - target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR) + # QtCharts/qxyseries.h fails to compile in 6.9.0 and 6.9.1 - see https://bugreports.qt.io/browse/QTBUG-135637 + #target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR) endif() target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH) diff --git a/gui/test/cppchecklibrarydata/CMakeLists.txt b/gui/test/cppchecklibrarydata/CMakeLists.txt index 8a508c45ba0..bb09135c9ff 100644 --- a/gui/test/cppchecklibrarydata/CMakeLists.txt +++ b/gui/test/cppchecklibrarydata/CMakeLists.txt @@ -17,8 +17,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-cppchecklibrarydata -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-cppchecklibrarydata -Wno-ctad-maybe-unsupported) endif() endif() diff --git a/gui/test/filelist/CMakeLists.txt b/gui/test/filelist/CMakeLists.txt index 8710fd949bb..09b5fcc29ef 100644 --- a/gui/test/filelist/CMakeLists.txt +++ b/gui/test/filelist/CMakeLists.txt @@ -20,8 +20,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-filelist -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-filelist -Wno-ctad-maybe-unsupported) endif() endif() diff --git a/gui/test/projectfile/CMakeLists.txt b/gui/test/projectfile/CMakeLists.txt index 95609df4483..b6f5cf64475 100644 --- a/gui/test/projectfile/CMakeLists.txt +++ b/gui/test/projectfile/CMakeLists.txt @@ -15,8 +15,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-projectfile -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-projectfile -Wno-ctad-maybe-unsupported) endif() endif() diff --git a/gui/test/resultstree/CMakeLists.txt b/gui/test/resultstree/CMakeLists.txt index 5348f460af7..0d0c8f1634f 100644 --- a/gui/test/resultstree/CMakeLists.txt +++ b/gui/test/resultstree/CMakeLists.txt @@ -43,8 +43,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-resultstree -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-resultstree -Wno-ctad-maybe-unsupported) endif() # caused by mocks diff --git a/gui/test/translationhandler/CMakeLists.txt b/gui/test/translationhandler/CMakeLists.txt index 03e53b2eb50..247253267d3 100644 --- a/gui/test/translationhandler/CMakeLists.txt +++ b/gui/test/translationhandler/CMakeLists.txt @@ -15,8 +15,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-translationhandler -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-translationhandler -Wno-ctad-maybe-unsupported) endif() endif() diff --git a/gui/test/xmlreportv2/CMakeLists.txt b/gui/test/xmlreportv2/CMakeLists.txt index 905377f5764..180101930cf 100644 --- a/gui/test/xmlreportv2/CMakeLists.txt +++ b/gui/test/xmlreportv2/CMakeLists.txt @@ -33,8 +33,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978 target_compile_options_safe(test-xmlreportv2 -Wno-extra-semi-stmt) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(test-xmlreportv2 -Wno-ctad-maybe-unsupported) endif() endif() diff --git a/releasenotes.txt b/releasenotes.txt index 134059bb6c0..4d3da24ef28 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -19,7 +19,7 @@ Deprecations: - Other: -- Updated Qt to 6.9.0 (official Windows release only). +- Updated Qt to 6.9.1 (official Windows release only). - added CMake target `run-clang-tidy-csa` to run Clang Static Analyzer - added CMake option `ENABLE_CSA_ALPHA` to enable the Clang Static Analyzer alpha checkers - Updated TinyXML-2 to v11.0.0 diff --git a/tools/triage/CMakeLists.txt b/tools/triage/CMakeLists.txt index 7fe6e403b42..4a810349872 100644 --- a/tools/triage/CMakeLists.txt +++ b/tools/triage/CMakeLists.txt @@ -39,8 +39,8 @@ CheckOptions: # QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038 target_compile_definitions(triage PRIVATE -DQT_NO_QPAIR) endif() - if(QT_VERSION VERSION_EQUAL "6.9.0") - # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 + if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0") + # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638 target_compile_options_safe(triage -Wno-ctad-maybe-unsupported) endif() target_compile_definitions(triage PRIVATE -DQT_NO_FOREACH)