From a9b8840e2695be83df2bd8a65a00be586614fd71 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 5 Dec 2024 13:25:58 +0100 Subject: Don't write code for Qt5 and Qt6 The --min-qt-version option doesn't accept anything lower than 6.0.0, so it doesn't make much sense to generate boilerplate code for supporting building with Qt 5 and 6. Much of what qmake2cmake generates is Qt6-only anyway. Fixes: QTBUG-104498 Change-Id: I461a48b46d659e9e567b1856f8dc19a6c73330e3 Reviewed-by: Alexey Edelev --- src/qmake2cmake/pro2cmake.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/qmake2cmake/pro2cmake.py') diff --git a/src/qmake2cmake/pro2cmake.py b/src/qmake2cmake/pro2cmake.py index 9413dba..c14edfa 100755 --- a/src/qmake2cmake/pro2cmake.py +++ b/src/qmake2cmake/pro2cmake.py @@ -3834,16 +3834,13 @@ def write_top_level_find_package_section( *, indent: int = 0, ): - # Write find_package call for Qt5/Qt6 and make it available as package QT. - cm_fh.write("find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)\n") - # Write find_package calls for required packages. write_find_package_section( cm_fh, dependencies.required_libs, indent=indent, end_with_extra_newline=False, - qt_package_name="Qt${QT_VERSION_MAJOR}", + qt_package_name="Qt6", ) # Remove optional packages that are already required. @@ -3856,7 +3853,7 @@ def write_top_level_find_package_section( indent=indent, is_required=False, end_with_extra_newline=False, - qt_package_name="Qt${QT_VERSION_MAJOR}", + qt_package_name="Qt6", ) -- cgit v1.2.3