diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-30 16:54:27 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-31 10:52:50 +0000 |
| commit | ad56115b8919a4dfdbbcfdc286095f38e5d3b2e0 (patch) | |
| tree | 9fb5245d86a0228f09b472b88d6437b41fa0f83a /tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt | |
| parent | 3abe3f4fcc521e7411d98d982bd2b46d10491a75 (diff) | |
Fix qqmlmoduleplugin test
Change-Id: I87354d4b8f8fc1acfe933640f5b48a4673a0dbd9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index 02db3b8bf3..746774c593 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -5,27 +5,20 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "imports/*") + imports/*) list(APPEND test_data ${test_data_glob}) - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_BINARY_DIR}/imports/*") + ${CMAKE_CURRENT_BINARY_DIR}/imports/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlmoduleplugin - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -44,23 +37,28 @@ add_qt_test(tst_qqmlmoduleplugin ) # Resources: +set(qmake_waitingPlugin_resource_files + "moduleWithWaitingPlugin" +) + add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" PREFIX "/qt-project.org/imports/" FILES - moduleWithWaitingPlugin + ${qmake_waitingPlugin_resource_files} +) +set(qmake_staticPlugin_resource_files + "moduleWithStaticPlugin" ) + add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" PREFIX "/qt-project.org/imports/" FILES - moduleWithStaticPlugin + ${qmake_staticPlugin_resource_files} ) -#### Keys ignored in scope 2:.:.:tst_qqmlmoduleplugin.pro:<TRUE>: -# CONFIG = "testcase" "-app_bundle" - ## Scopes: ##################################################################### @@ -93,3 +91,4 @@ add_subdirectory(plugin/childplugin) add_subdirectory(plugin.2/childplugin) add_subdirectory(plugin.2.1/childplugin) add_subdirectory(plugin.2.2) +add_subdirectory(moduleWithQmlSingleton) |