Skip to content

Commit 7b159a6

Browse files
firewavefirewave
committed
fixed #13133 - removed deprecated Qt5 support
1 parent 7cdf9f9 commit 7b159a6

35 files changed

Lines changed: 53 additions & 259 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: CMake build (with GUI)
7474
if: matrix.build_gui
7575
run: |
76-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
76+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7777
cmake --build cmake.output -- -j$(nproc)
7878
7979
- name: Run CMake test

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

Lines changed: 15 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 }}
@@ -44,16 +44,15 @@ jobs:
4444
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4545

4646
- name: Install missing software on ubuntu
47-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
47+
if: contains(matrix.os, 'ubuntu')
4848
run: |
4949
sudo apt-get update
50-
sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
50+
sudo apt-get install libxml2-utils libtinyxml2-dev
5151
52-
- name: Install missing software on ubuntu
53-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
52+
- name: Install missing software on ubuntu (Qt6)
53+
if: contains(matrix.os, 'ubuntu') && matrix.build_gui
5454
run: |
5555
sudo apt-get update
56-
sudo apt-get install libxml2-utils libtinyxml2-dev
5756
# qt6-tools-dev-tools for lprodump
5857
# qt6-l10n-tools for lupdate
5958
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
@@ -68,13 +67,13 @@ jobs:
6867
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6968
if: contains(matrix.os, 'ubuntu')
7069
run: |
71-
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 -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
70+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=${{ matrix.build_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7271
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7372
7473
- name: CMake build on macos (with GUI / system tinyxml2)
7574
if: contains(matrix.os, 'macos')
7675
run: |
77-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=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
76+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=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
7877
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7978
8079
- name: Run CMake test (system tinyxml2)
@@ -87,9 +86,9 @@ jobs:
8786
matrix:
8887
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
8988
include:
90-
- use_qt6: On
89+
- build_gui: On
9190
- os: ubuntu-20.04
92-
use_qt6: Off
91+
build_gui: Off
9392
fail-fast: false # Prefer quick result
9493

9594
runs-on: ${{ matrix.os }}
@@ -108,12 +107,6 @@ jobs:
108107
with:
109108
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
110109

111-
- name: Install missing software on ubuntu
112-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
113-
run: |
114-
sudo apt-get update
115-
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
116-
117110
# TODO: move latest compiler to separate step
118111
# TODO: bail out on warnings with latest GCC
119112
- name: Set up GCC
@@ -129,7 +122,7 @@ jobs:
129122
echo "CXX=g++-13" >> $GITHUB_ENV
130123
131124
- name: Install missing software on ubuntu
132-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
125+
if: contains(matrix.os, 'ubuntu')
133126
run: |
134127
sudo apt-get update
135128
sudo apt-get install libxml2-utils
@@ -147,12 +140,14 @@ jobs:
147140
- name: Run CMake on ubuntu (with GUI)
148141
if: contains(matrix.os, 'ubuntu')
149142
run: |
150-
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 -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
143+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=${{ matrix.build_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
144+
cmake --build cmake.output -- -j$(nproc)
151145
152146
- name: Run CMake on macos (with GUI)
153147
if: contains(matrix.os, 'macos')
154148
run: |
155-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
149+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
150+
cmake --build cmake.output -- -j$(nproc)
156151
157152
- name: Run CMake build
158153
run: |

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

Lines changed: 2 additions & 13 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.8.2]
30+
qt_ver: [6.8.2]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}
@@ -49,22 +49,11 @@ jobs:
4949
modules: 'qtcharts'
5050
cache: true
5151

52-
- name: Run CMake for GUI release (Qt 5)
53-
if: startsWith(matrix.qt_ver, '5')
52+
- name: Build GUI release
5453
run: |
5554
; TODO: enable rules?
5655
; specify Release build so matchcompiler is used
5756
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install || exit /b !errorlevel!
58-
59-
- name: Run CMake for GUI release (Qt 6)
60-
if: startsWith(matrix.qt_ver, '6')
61-
run: |
62-
; TODO: enable rules?
63-
; specify Release build so matchcompiler is used
64-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install || exit /b !errorlevel!
65-
66-
- name: Run CMake build
67-
run: |
6857
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
6958
7059
- name: Deploy GUI

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

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

‎.github/workflows/iwyu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- name: Prepare CMake
111111
run: |
112112
# TODO: why does it build dmake in the next step?
113-
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 -DBUILD_TRIAGE=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 -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
113+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=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 -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
114114
env:
115115
CC: clang
116116
CXX: clang++
@@ -201,7 +201,7 @@ jobs:
201201
- name: Prepare CMake
202202
run: |
203203
# TODO: why does it build dmake in the next step?
204-
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 -DBUILD_TRIAGE=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 -DUSE_LIBCXX=${{ matrix.use_libcxx }}
204+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=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 -DUSE_LIBCXX=${{ matrix.use_libcxx }}
205205
env:
206206
CC: clang-19
207207
CXX: clang++-19

‎.github/workflows/selfcheck.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# unusedFunction - start
6464
- name: CMake
6565
run: |
66-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
66+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
6767
6868
- name: Generate dependencies
6969
run: |
@@ -90,7 +90,7 @@ jobs:
9090
# unusedFunction notest - start
9191
- name: CMake (no test)
9292
run: |
93-
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
93+
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
9494
9595
- name: Generate dependencies (no test)
9696
run: |
@@ -132,7 +132,7 @@ jobs:
132132
# unusedFunction notest nocli - start
133133
- name: CMake (no test / no cli)
134134
run: |
135-
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 -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
135+
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 -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
136136
137137
- name: Generate dependencies (no test / no cli)
138138
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
elseif(USE_BOOST AND USE_BOOST_INT128)

‎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
@@ -64,7 +64,6 @@ option(BUILD_CLI "Build the cli application"
6464

6565
option(BUILD_GUI "Build the qt application" OFF)
6666
option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF)
67-
option(USE_QT6 "Prefer Qt6 when available" OFF)
6867
option(REGISTER_GUI_TESTS "Register GUI tests in CTest" ON)
6968
option(BUILD_ONLINE_HELP "Build online help" OFF)
7069
option(BUILD_TRIAGE "Build triage UI tool" OFF)

‎cmake/printInfo.cmake‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,9 @@ message(STATUS "BUILD_GUI = ${BUILD_GUI}")
6363
if(BUILD_GUI)
6464
message(STATUS "REGISTER_GUI_TESTS = ${REGISTER_GUI_TESTS}")
6565
message(STATUS "WITH_QCHART = ${WITH_QCHART}")
66-
message(STATUS "USE_QT6 = ${USE_QT6}")
6766
message(STATUS "QT_VERSION = ${QT_VERSION}")
68-
if(USE_QT6)
69-
message(STATUS "Qt6Core_LIBRARIES = ${Qt6Core_LIBRARIES}")
70-
message(STATUS "Qt6Core_INCLUDE_DIRS = ${Qt6Core_INCLUDE_DIRS}")
71-
else()
72-
message(STATUS "Qt5Core_LIBRARIES = ${Qt5Core_LIBRARIES}")
73-
message(STATUS "Qt5Core_INCLUDE_DIRS = ${Qt5Core_INCLUDE_DIRS}")
74-
endif()
67+
message(STATUS "Qt6Core_LIBRARIES = ${Qt6Core_LIBRARIES}")
68+
message(STATUS "Qt6Core_INCLUDE_DIRS = ${Qt6Core_INCLUDE_DIRS}")
7569
message(STATUS "QHELPGENERATOR = ${QHELPGENERATOR}")
7670
endif()
7771
message(STATUS)

0 commit comments

Comments
 (0)