Skip to content

Commit ff6667d

Browse files
firewavefirewave
committed
fixed #13133 - removed deprecated Qt5 support
1 parent f7a5788 commit ff6667d

28 files changed

Lines changed: 53 additions & 208 deletions

‎.github/workflows/CI-unixish-docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: CMake build (with GUI)
102102
if: matrix.build_gui
103103
run: |
104-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
104+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
105105
cmake --build cmake.output -- -j$(nproc)
106106
107107
- name: Run CMake test

‎.github/workflows/CI-unixish.yml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
matrix:
2323
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
2424
include:
25-
- use_qt6: On
25+
- build_gui: On
2626
- os: ubuntu-20.04
27-
use_qt6: Off
27+
build_gui: Off
2828
fail-fast: false # Prefer quick result
2929

3030
runs-on: ${{ matrix.os }}
@@ -42,16 +42,15 @@ jobs:
4242
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4343

4444
- name: Install missing software on ubuntu
45-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
45+
if: contains(matrix.os, 'ubuntu')
4646
run: |
4747
sudo apt-get update
48-
sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
48+
sudo apt-get install libxml2-utils libtinyxml2-dev
4949
50-
- name: Install missing software on ubuntu
51-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
50+
- name: Install missing software on ubuntu (Qt6)
51+
if: contains(matrix.os, 'ubuntu') && matrix.build_gui
5252
run: |
5353
sudo apt-get update
54-
sudo apt-get install libxml2-utils libtinyxml2-dev
5554
# qt6-tools-dev-tools for lprodump
5655
# qt6-l10n-tools for lupdate
5756
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
@@ -66,13 +65,13 @@ jobs:
6665
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6766
if: contains(matrix.os, 'ubuntu')
6867
run: |
69-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
68+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=${{ matrix.build_gui }} -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7069
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7170
7271
- name: CMake build on macos (with GUI / system tinyxml2)
7372
if: contains(matrix.os, 'macos')
7473
run: |
75-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
74+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
7675
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7776
7877
- name: Run CMake test (system tinyxml2)
@@ -85,9 +84,9 @@ jobs:
8584
matrix:
8685
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
8786
include:
88-
- use_qt6: On
87+
- build_gui: On
8988
- os: ubuntu-20.04
90-
use_qt6: Off
89+
build_gui: Off
9190
fail-fast: false # Prefer quick result
9291

9392
runs-on: ${{ matrix.os }}
@@ -104,12 +103,6 @@ jobs:
104103
with:
105104
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
106105

107-
- name: Install missing software on ubuntu
108-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
109-
run: |
110-
sudo apt-get update
111-
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
112-
113106
# TODO: move latest compiler to separate step
114107
# TODO: bail out on warnings with latest GCC
115108
- name: Set up GCC
@@ -125,7 +118,7 @@ jobs:
125118
echo "CXX=g++-13" >> $GITHUB_ENV
126119
127120
- name: Install missing software on ubuntu
128-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
121+
if: contains(matrix.os, 'ubuntu')
129122
run: |
130123
sudo apt-get update
131124
sudo apt-get install libxml2-utils
@@ -143,13 +136,13 @@ jobs:
143136
- name: CMake build on ubuntu (with GUI)
144137
if: contains(matrix.os, 'ubuntu')
145138
run: |
146-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
139+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=${{ matrix.build_gui }} -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
147140
cmake --build cmake.output -- -j$(nproc)
148141
149142
- name: CMake build on macos (with GUI)
150143
if: contains(matrix.os, 'macos')
151144
run: |
152-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
145+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
153146
cmake --build cmake.output -- -j$(nproc)
154147
155148
- name: Run CMake test

‎.github/workflows/CI-windows.yml‎

Lines changed: 3 additions & 12 deletions
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.7.3]
30+
qt_ver: [6.7.3]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}
@@ -47,20 +47,11 @@ jobs:
4747
modules: 'qtcharts'
4848
cache: true
4949

50-
- name: Build GUI release (Qt 5)
51-
if: startsWith(matrix.qt_ver, '5')
50+
- name: Build GUI release
5251
run: |
5352
; TODO: enable rules?
5453
; specify Release build so matchcompiler is used
55-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
56-
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
57-
58-
- name: Build GUI release (Qt 6)
59-
if: startsWith(matrix.qt_ver, '6')
60-
run: |
61-
; TODO: enable rules?
62-
; specify Release build so matchcompiler is used
63-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
54+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
6455
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
6556
6657
- name: Deploy GUI

‎.github/workflows/clang-tidy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Prepare CMake
5757
run: |
58-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
58+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
5959
env:
6060
CC: clang-19
6161
CXX: clang++-19

‎.github/workflows/iwyu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Prepare CMake
8888
run: |
89-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
89+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
9090
env:
9191
CC: clang
9292
CXX: clang++
@@ -160,7 +160,7 @@ jobs:
160160

161161
- name: Prepare CMake
162162
run: |
163-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
163+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
164164
env:
165165
CC: clang-19
166166
CXX: clang++-19

‎.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: 5.15.2
30+
QT_VERSION: 6.7.3
3131

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

‎.github/workflows/selfcheck.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
# unusedFunction - start
6161
- name: CMake
6262
run: |
63-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
63+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
6464
6565
- name: Generate dependencies
6666
run: |
@@ -87,7 +87,7 @@ jobs:
8787
# unusedFunction notest - start
8888
- name: CMake (no test)
8989
run: |
90-
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
90+
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
9191
9292
- name: Generate dependencies (no test)
9393
run: |
@@ -129,7 +129,7 @@ jobs:
129129
# unusedFunction notest nocli - start
130130
- name: CMake (no test / no cli)
131131
run: |
132-
cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
132+
cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
133133
134134
- name: Generate dependencies (no test / no cli)
135135
run: |

‎cmake/cxx11.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
macro(use_cxx11)
22
# some GitHub Action Windows runners randomly fail with a complaint that Qt6 requires a C++17 compiler
3-
if(MSVC AND USE_QT6)
3+
if(MSVC)
44
# CMAKE_CXX_STANDARD 17 was added in CMake 3.8
55
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
66
else()

‎cmake/findDependencies.cmake‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,21 @@ if(BUILD_GUI)
66
if(BUILD_TESTS)
77
list(APPEND qt_components Test)
88
endif()
9-
if(USE_QT6)
10-
find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
11-
set(QT_VERSION "${Qt6Core_VERSION}")
12-
if(NOT QT_VERSION)
13-
# TODO: remove fallback
14-
message(WARNING "'Qt6Core_VERSION' is not set - using 6.0.0 as fallback")
15-
set(QT_VERSION "6.0.0")
16-
endif()
17-
if(MSVC)
18-
# disable Visual Studio C++ memory leak detection since it causes compiler errors with Qt 6
19-
# D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): warning C4003: not enough arguments for function-like macro invocation 'free' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
20-
# D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): error C2059: syntax error: ',' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
21-
# this is supposed to be fixed according to the following tickets but it still happens
22-
# https://bugreports.qt.io/browse/QTBUG-40575
23-
# https://bugreports.qt.io/browse/QTBUG-86395
24-
set(DISABLE_CRTDBG_MAP_ALLOC ON)
25-
endif()
26-
else()
27-
message(WARNING "Building with Qt5 is deprecated (it went EOL in May 2023) and will be removed in a future release - please use Qt6 instead")
28-
find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
29-
set(QT_VERSION "${Qt5Core_VERSION_STRING}")
9+
find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
10+
set(QT_VERSION "${Qt6Core_VERSION}")
11+
if(NOT QT_VERSION)
12+
# TODO: remove fallback
13+
message(WARNING "'Qt6Core_VERSION' is not set - using 6.0.0 as fallback")
14+
set(QT_VERSION "6.0.0")
15+
endif()
16+
if(MSVC)
17+
# disable Visual Studio C++ memory leak detection since it causes compiler errors with Qt 6
18+
# D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): warning C4003: not enough arguments for function-like macro invocation 'free' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
19+
# D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): error C2059: syntax error: ',' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
20+
# this is supposed to be fixed according to the following tickets but it still happens
21+
# https://bugreports.qt.io/browse/QTBUG-40575
22+
# https://bugreports.qt.io/browse/QTBUG-86395
23+
set(DISABLE_CRTDBG_MAP_ALLOC ON)
3024
endif()
3125

3226
if(BUILD_ONLINE_HELP)

‎cmake/options.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ option(BUILD_CLI "Build the cli application"
5555

5656
option(BUILD_GUI "Build the qt application" OFF)
5757
option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF)
58-
option(USE_QT6 "Prefer Qt6 when available" OFF)
5958
option(REGISTER_GUI_TESTS "Register GUI tests in CTest" ON)
6059
option(BUILD_ONLINE_HELP "Build online help" OFF)
6160

0 commit comments

Comments
 (0)