Skip to content

fixed #13980 - updated Qt to 6.9.1 #7642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 3 commits into from
Jul 3, 2025
Merged

fixed #13980 - updated Qt to 6.9.1 #7642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bfb825
fixed #13980 - updated Qt to 6.9.1
firewave Jul 3, 2025
b64c7dc
gui/CMakeLists.txt: disabled `QT_NO_QPAIR` for now
firewave Jul 3, 2025
0b36c8a
disables `-Wctad-maybe-unsupported` for all Qt 6.9 versions
firewave Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/asan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/iwyu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
image: ${{ matrix.image }}

env:
QT_VERSION: 6.9.0
QT_VERSION: 6.9.1

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/selfcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tsan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubsan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions gui/test/cppchecklibrarydata/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions gui/test/filelist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions gui/test/projectfile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions gui/test/resultstree/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gui/test/translationhandler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions gui/test/xmlreportv2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion releasenotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/triage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading