diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-17 11:57:33 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-21 16:31:38 +0200 |
commit | 4ea5a0b72323614c436f8e8f03d4da64745247c2 (patch) | |
tree | 6efdd1782ae17d967aa7f402b81e4e262b9f3bfe /tests/auto | |
parent | 97f6ee941ba6e3a1e16ee2067261c4d8c4cbb556 (diff) |
Use fixed qt_add_resource BASE argument
Fixes: QTBUG-93849
Task-number: QTBUG-86726
Change-Id: If6e1033642d98ccd40daeb57a453c0e5bc2985da
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 1917a868d9bbd6c916e2a54cad6ad28780f73f34)
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qmlcachegen/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/auto/qml/qqmltranslation/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt | 5 |
3 files changed, 5 insertions, 19 deletions
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index 06a5fb9b9c..d03e277b93 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -56,11 +56,8 @@ qt_internal_add_resource(tst_qmlcachegen "trickypaths" FILES ${trickypaths_resource_files} ) -set_source_files_properties("data/Retain.qml" - PROPERTIES QT_RESOURCE_ALIAS "Retain.qml" -) set(retain_resource_files - "Retain.qml" + "data/Retain.qml" ) qt_internal_add_resource(tst_qmlcachegen "retain" @@ -76,14 +73,12 @@ set_source_files_properties("data/SkipQmlCacheGen.qml" QT_SKIP_QUICKCOMPILER 1 ) set(skip_resource_files - "SkipQmlCacheGen.qml" + "data/SkipQmlCacheGen.qml" ) qt_internal_add_resource(tst_qmlcachegen "skip" PREFIX "/not/" - BASE - "data" FILES ${skip_resource_files} ) diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt index 6e67a2ecfb..cb402b3e64 100644 --- a/tests/auto/qml/qqmltranslation/CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt @@ -27,8 +27,8 @@ qt_internal_add_test(tst_qqmltranslation # Resources: set(translation_resource_files - "qml_fr.qm" - "translation.qml" + "data/qml_fr.qm" + "data/translation.qml" ) # special case begin @@ -36,12 +36,6 @@ set_source_files_properties( data/translation.qml PROPERTIES QT_SKIP_QUICKCOMPILER 1 - QT_RESOURCE_ALIAS translation.qml -) -set_source_files_properties( - data/qml_fr.qm - PROPERTIES - QT_RESOURCE_ALIAS qml_fr.qm ) # special case end diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt index 9c44abd939..58aa6e95f1 100644 --- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt @@ -24,12 +24,9 @@ qt_internal_add_test(tst_qquickfolderlistmodel TESTDATA ${test_data} ) -# special case begin -set_source_files_properties(data/txtdir/hello.txt PROPERTIES QT_RESOURCE_ALIAS "txtdir/hello.txt") -# special case end # Resources: set(introspect_resource_files - "txtdir/hello.txt" + "data/txtdir/hello.txt" ) qt_internal_add_resource(tst_qquickfolderlistmodel "introspect" |