Skip to content

deprecated qmake build system / removed Qt5 fallback when using USE_QT6=On #5271

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
firewave merged 3 commits into from
Aug 9, 2023
Merged

deprecated qmake build system / removed Qt5 fallback when using USE_QT6=On #5271

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
819e5b5
gui.pro: bail out when it is used with Qt6 - we only support that via…
firewave Feb 27, 2023
d3d63bb
findDependencies.cmake: no longer fall back to Qt5 when Qt6 is not fo…
firewave Feb 27, 2023
571be60
deprecated qmake build system
firewave Feb 27, 2023
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
15 changes: 5 additions & 10 deletions cmake/findDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@ if (BUILD_GUI)
list(APPEND qt_components Test)
endif()
if (USE_QT6)
find_package(Qt6 COMPONENTS ${qt_components} QUIET)
endif()
if (NOT Qt6Core_FOUND)
find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
set(QT_VERSION "${Qt5Core_VERSION_STRING}")
else()
# detect faulty Qt6 installation by jurplel/install-qt-action@v2
if (WITH_QCHART AND NOT Qt6Charts_FOUND)
message(FATAL_ERROR "QtCharts not found")
endif()
find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
set(QT_VERSION "${Qt6Core_VERSION_STRING}")
if (NOT QT_VERSION)
# TODO: how to get the actual version?
message(WARNING "'Qt6Core_VERSION_STRING' is not set - using 6.0.0 as fallback")
set(QT_VERSION "6.0.0")
endif()
Expand All @@ -31,6 +23,9 @@ if (BUILD_GUI)
# https://bugreports.qt.io/browse/QTBUG-86395
set(DISABLE_CRTDBG_MAP_ALLOC ON)
endif()
else()
find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
set(QT_VERSION "${Qt5Core_VERSION_STRING}")
endif()
endif()

Expand Down
3 changes: 3 additions & 0 deletions gui/gui.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
lessThan(QT_MAJOR_VERSION, 5): error(requires >= Qt 5 (You used: $$QT_VERSION))
greaterThan(QT_MAJOR_VERSION, 5): error(Qt 6 is not supported via qmake - please use CMake instead)

message("Building the GUI via qmake is deprecated and will be removed in a future release. Please use CMake instead.")

TEMPLATE = app
TARGET = cppcheck-gui
Expand Down
2 changes: 2 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ cmake --build . --config RelWithDebInfo

### qmake

NOTE: This has been deprecated and will be removed in a future version. Please use CMake instead.

You can use the gui/gui.pro file to build the GUI.

```shell
Expand Down
4 changes: 4 additions & 0 deletions releasenotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ GUI:

Changed interface:

Deprecations:
- The qmake build system has been deprecated and will be removed in a future version.

Other:
- "USE_QT6=On" will no longer fallback to Qt5 when Qt6 is not found.