diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:33:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:42 +0000 |
| commit | 30917cd20ce1e40482e967fdafb5f8b95a62b640 (patch) | |
| tree | 090589f0c9984fc5a0715844fdfa7b993551bab6 /tests/auto/qml/qmlcachegen | |
| parent | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (diff) | |
Regenerate required projects after dev -> wip/cmake merge
Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcachegen')
| -rw-r--r-- | tests/auto/qml/qmlcachegen/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 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" ) |