File tree Expand file tree Collapse file tree 4 files changed +14
-10
lines changed
Expand file tree Collapse file tree 4 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -7,18 +7,10 @@ if (BUILD_GUI)
77 list (APPEND qt_components Test )
88 endif ()
99 if (USE_QT6)
10- find_package (Qt6 COMPONENTS ${qt_components} QUIET )
11- endif ()
12- if (NOT Qt6Core_FOUND)
13- find_package (Qt5 COMPONENTS ${qt_components} REQUIRED)
14- set (QT_VERSION "${Qt5Core_VERSION_STRING} " )
15- else ()
16- # detect faulty Qt6 installation by jurplel/install-qt-action@v2
17- if (WITH_QCHART AND NOT Qt6Charts_FOUND)
18- message (FATAL_ERROR "QtCharts not found" )
19- endif ()
10+ find_package (Qt6 COMPONENTS ${qt_components} REQUIRED)
2011 set (QT_VERSION "${Qt6Core_VERSION_STRING} " )
2112 if (NOT QT_VERSION)
13+ # TODO: how to get the actual version?
2214 message (WARNING "'Qt6Core_VERSION_STRING' is not set - using 6.0.0 as fallback" )
2315 set (QT_VERSION "6.0.0" )
2416 endif ()
@@ -31,6 +23,9 @@ if (BUILD_GUI)
3123 # https://bugreports.qt.io/browse/QTBUG-86395
3224 set (DISABLE_CRTDBG_MAP_ALLOC ON )
3325 endif ()
26+ else ()
27+ find_package (Qt5 COMPONENTS ${qt_components} REQUIRED)
28+ set (QT_VERSION "${Qt5Core_VERSION_STRING} " )
3429 endif ()
3530endif ()
3631
Original file line number Diff line number Diff line change 11lessThan(QT_MAJOR_VERSION, 5): error (requires >= Qt 5 (You used: $$QT_VERSION ))
2+ greaterThan(QT_MAJOR_VERSION, 5): error (Qt 6 is not supported via qmake - please use CMake instead )
3+
4+ message ("Building the GUI via qmake is deprecated and will be removed in a future release. Please use CMake instead." )
25
36TEMPLATE = app
47TARGET = cppcheck-gui
Original file line number Diff line number Diff line change @@ -86,6 +86,8 @@ cmake --build . --config RelWithDebInfo
8686
8787### qmake
8888
89+ NOTE: This has been deprecated and will be removed in a future version. Please use CMake instead.
90+
8991You can use the gui/gui.pro file to build the GUI.
9092
9193``` shell
Original file line number Diff line number Diff line change 88
99Changed interface:
1010
11+ Deprecations:
12+ - The qmake build system has been deprecated and will be removed in a future version.
13+
1114Other:
15+ - "USE_QT6=On" will no longer fallback to Qt5 when Qt6 is not found.
You can’t perform that action at this time.
0 commit comments