Skip to content

Commit a214e76

Browse files
firewavefirewave
authored
fixed #13980 - updated Qt to 6.9.1 (#7642)
1 parent 90b0e14 commit a214e76

17 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎.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.9.0]
30+
qt_ver: [5.15.2, 6.9.1]
3131
fail-fast: false
3232

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

‎.github/workflows/asan.yml‎

Lines changed: 1 addition & 1 deletion
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.9.0
24+
QT_VERSION: 6.9.1
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

‎.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.9.0
27+
QT_VERSION: 6.9.1
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
@@ -39,7 +39,7 @@ jobs:
3939
image: ${{ matrix.image }}
4040

4141
env:
42-
QT_VERSION: 6.9.0
42+
QT_VERSION: 6.9.1
4343

4444
steps:
4545
- uses: actions/checkout@v4
@@ -186,7 +186,7 @@ jobs:
186186
if: ${{ github.repository_owner == 'danmar' }}
187187

188188
env:
189-
QT_VERSION: 6.9.0
189+
QT_VERSION: 6.9.1
190190

191191
steps:
192192
- 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.9.0
30+
QT_VERSION: 6.9.1
3131

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

‎.github/workflows/selfcheck.yml‎

Lines changed: 1 addition & 1 deletion
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.9.0
24+
QT_VERSION: 6.9.1
2525

2626
steps:
2727
- uses: actions/checkout@v4

‎.github/workflows/tsan.yml‎

Lines changed: 1 addition & 1 deletion
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.9.0
24+
QT_VERSION: 6.9.1
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

‎.github/workflows/ubsan.yml‎

Lines changed: 1 addition & 1 deletion
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.9.0
24+
QT_VERSION: 6.9.1
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

‎gui/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ 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
78+
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
79+
# caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
8080
target_compile_options_safe(cppcheck-gui -Wno-ctad-maybe-unsupported)
8181
endif()
8282
endif()
83-
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.1")
83+
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.2")
8484
# 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
86-
target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
85+
# QtCharts/qxyseries.h fails to compile in 6.9.0 and 6.9.1 - see https://bugreports.qt.io/browse/QTBUG-135637
86+
#target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
8787
endif()
8888
target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH)
8989

‎gui/test/cppchecklibrarydata/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ 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
20+
if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
21+
# caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
2222
target_compile_options_safe(test-cppchecklibrarydata -Wno-ctad-maybe-unsupported)
2323
endif()
2424
endif()

0 commit comments

Comments
 (0)