diff options
| author | Joerg Bornemann <[email protected]> | 2024-12-05 13:25:58 +0100 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2024-12-06 16:10:18 +0100 |
| commit | a9b8840e2695be83df2bd8a65a00be586614fd71 (patch) | |
| tree | 37ead6049247c3ee490081907c52c4cbe74ecbeb /tests | |
| parent | 75c82354d9f2f4c86d9b5049bd0ea9fdc3fd0e78 (diff) | |
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 <[email protected]>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/conversion/subdirs/expected/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | tests/test_conversion.py | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/data/conversion/subdirs/expected/CMakeLists.txt b/tests/data/conversion/subdirs/expected/CMakeLists.txt index 36a4f57..7a497aa 100644 --- a/tests/data/conversion/subdirs/expected/CMakeLists.txt +++ b/tests/data/conversion/subdirs/expected/CMakeLists.txt @@ -9,9 +9,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) include(GNUInstallDirs) -find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Network OpenGL) -find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Core5Compat) +find_package(Qt6 REQUIRED COMPONENTS Gui Network OpenGL) +find_package(Qt6 OPTIONAL_COMPONENTS Core5Compat) qt_add_executable(app WIN32 MACOSX_BUNDLE main.cpp diff --git a/tests/test_conversion.py b/tests/test_conversion.py index 0adbbbe..de049b4 100755 --- a/tests/test_conversion.py +++ b/tests/test_conversion.py @@ -76,17 +76,15 @@ def test_qt_modules(): for line in output.split("\n"): if "find_package(" in line: find_package_lines.append(line.strip()) - assert(["find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)", - "find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Network Widgets)"] == find_package_lines) + assert(["find_package(Qt6 REQUIRED COMPONENTS Network Widgets)"] == find_package_lines) output = convert("optional_qt_modules") find_package_lines = [] for line in output.split("\n"): if "find_package(" in line: find_package_lines.append(line.strip()) - assert(["find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)", - "find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Network Widgets)", - "find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS OpenGL)"] == find_package_lines) + assert(["find_package(Qt6 REQUIRED COMPONENTS Network Widgets)", + "find_package(Qt6 OPTIONAL_COMPONENTS OpenGL)"] == find_package_lines) def test_qt_version_check(): '''Test the conversion of QT_VERSION checks.''' |