diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qmlcachegen/CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/auto/quick/qquickboundaryrule/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/quick/qquickdroparea/CMakeLists.txt | 29 |
3 files changed, 34 insertions, 23 deletions
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index f834c78309..46a692eb4e 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # 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}) add_qt_test(tst_qmlcachegen - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlcachegen.cpp @@ -65,14 +62,14 @@ set_source_files_properties("data/Retain.qml" PROPERTIES QT_RESOURCE_ALIAS "Retain.qml" ) set(retain_resource_files - "data/Retain.qml" + "Retain.qml" ) -set_source_files_properties(${retain_resource_files} PROPERTIES QT_RETAIN_QUICKCOMPILER 1) - add_qt_resource(tst_qmlcachegen "retain" PREFIX "/" + BASE + "data" FILES ${retain_resource_files} ) @@ -82,8 +79,10 @@ set(qmake_immediate_resource_files "data/jsimport.qml" "data/jsmoduleimport.qml" "data/library.js" + "data/module.mjs" "data/script.js" "data/script.mjs" + "data/utils.mjs" "data/versionchecks.qml" ) diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt index afb34d3423..8d6c8910aa 100644 --- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt +++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # 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}) add_qt_test(tst_qquickboundaryrule - GUI SOURCES ../../shared/util.cpp ../../shared/util.h ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h @@ -36,15 +33,9 @@ add_qt_test(tst_qquickboundaryrule TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qquickboundaryrule.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickboundaryrule.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index 083a08cf10..ea66f99c0c 100644 --- a/tests/auto/quick/qquickdroparea/CMakeLists.txt +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -4,10 +4,23 @@ ## tst_qquickdroparea Test: ##################################################################### +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + add_qt_test(tst_qquickdroparea - GUI SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickdroparea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared LIBRARIES Qt::CorePrivate Qt::GuiPrivate @@ -18,13 +31,21 @@ add_qt_test(tst_qquickdroparea Qt::Network Qt::Qml Qt::Quick + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:qquickdroparea.pro:<TRUE>: -# CONFIG = "testcase" +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qquickdroparea.pro:APPLE_OSX: -# CONFIG = "-app_bundle" +extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) |