diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 18:03:59 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-02 14:17:55 +0000 |
| commit | 5159596f8b587fdd2d919a9fd4fabd91a2f5f18c (patch) | |
| tree | f5460d13e95d4fb809d86eaf1ef7a08e49f51427 /tests | |
| parent | 784aad8fd0387e11297cd27ed814e875dc5f914b (diff) | |
Update and re-enable the cmake qmlimportscanner auto test for Qt6
Change-Id: I973d2d204518a0a09b2ba26df8263244e9343d7c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit a4f5f96fb8ed185ed14bafbd2383b6940af0988a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | tests/auto/cmake/qmlimportscanner/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | tests/auto/cmake/qmlimportscanner/qis_test.qrc | 6 |
3 files changed, 27 insertions, 27 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index c1bad1abbc..22d08728f1 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -67,12 +67,16 @@ endif() if(TARGET Qt::Quick) _qt_internal_test_expect_pass(qtquickcompiler BINARY qqc_test) - # _qt_internal_test_expect_pass(qmlimportscanner) # TODO: Replace with 6.2 qml module API -endif() - -if(TARGET Qt::Quick AND NOT QT6_IS_SHARED_LIBS_BUILD) - _qt_internal_test_expect_pass(test_import_static_shapes_plugin_resources - BINARY "${CMAKE_CTEST_COMMAND}" - BINARY_ARGS "-V" - ) + if(NOT QT6_IS_SHARED_LIBS_BUILD) + _qt_internal_test_expect_pass(test_import_static_shapes_plugin_resources + BINARY "${CMAKE_CTEST_COMMAND}" + BINARY_ARGS "-V" + ) + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.21") + _qt_internal_test_expect_pass(qmlimportscanner + TESTNAME cmake_qmlimportscanner + BINARY qis_test + ) + endif() + endif() endif() diff --git a/tests/auto/cmake/qmlimportscanner/CMakeLists.txt b/tests/auto/cmake/qmlimportscanner/CMakeLists.txt index 354b0f8dfc..405066e3cb 100644 --- a/tests/auto/cmake/qmlimportscanner/CMakeLists.txt +++ b/tests/auto/cmake/qmlimportscanner/CMakeLists.txt @@ -1,18 +1,20 @@ - -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.21) project(qis_test) -find_package(Qt5Qml 5.0.0 REQUIRED) -find_package(Qt5Gui 5.0.0 REQUIRED) -find_package(Qt5Test 5.0.0 REQUIRED) -find_package(Qt5QmlImportScanner REQUIRED) - -set(CMAKE_CXXFLAGS "${CMAKE_CXXFLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") +find_package(Qt6 REQUIRED COMPONENTS Core Test Qml) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -add_executable(qis_test "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/qis_test.qrc") -target_link_libraries(qis_test PRIVATE Qt5::Gui Qt5::Qml Qt5::Test) -qt5_import_qml_plugins(qis_test) +# We explicitly don't want to use qt_add_executable() here because we want to +# manually invoke qt6_import_qml_plugins() ourselves later +add_executable(qis_test main.cpp) +target_link_libraries(qis_test PRIVATE Qt6::Test Qt6::Qml Qt6::Core) + +qt6_add_qml_module(qis_test + URI Test + VERSION 1.0 + NO_RESOURCE_TARGET_PATH + QML_FILES main.qml +) + +qt6_import_qml_plugins(qis_test) diff --git a/tests/auto/cmake/qmlimportscanner/qis_test.qrc b/tests/auto/cmake/qmlimportscanner/qis_test.qrc deleted file mode 100644 index 1f88fc4e71..0000000000 --- a/tests/auto/cmake/qmlimportscanner/qis_test.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> -<file>./main.qml</file> -<file alias="main.cpp">./main.cpp</file> -</qresource> -</RCC> |