aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/auto/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qmlcachegen/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qqmltranslation/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qrcqml/CMakeLists.txt16
-rw-r--r--tests/manual/mousearea/CMakeLists.txt22
-rw-r--r--tests/manual/pointer/CMakeLists.txt22
-rw-r--r--tests/manual/text/CMakeLists.txt22
-rw-r--r--tests/manual/touch/CMakeLists.txt22
9 files changed, 63 insertions, 61 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 329cd303be..1589fe207f 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -5,7 +5,9 @@ add_subdirectory(quick)
add_subdirectory(quicktest)
add_subdirectory(qmldevtools)
add_subdirectory(cmake)
-add_subdirectory(installed_cmake)
+# special case begin
+# add_subdirectory(installed_cmake)
+# special case end
add_subdirectory(toolsupport)
if(NOT APPLE_UIKIT)
add_subdirectory(qmltest)
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 0ac705cd0d..f834c78309 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -41,13 +41,13 @@ add_qt_resource(tst_qmlcachegen "qmake_workerscripts_test"
${qmake_workerscripts_test_resource_files}
)
set_source_files_properties("data/trickypaths.qml"
- PROPERTIES alias "file name with spaces.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "file name with spaces.qml"
)
set_source_files_properties("data/versionStyleSuffix-1.2-core-yc.qml"
- PROPERTIES alias "versionStyleSuffix-1.2-core-yc.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "versionStyleSuffix-1.2-core-yc.qml"
)
set_source_files_properties("data/versionStyleSuffix-1.2-more.qml"
- PROPERTIES alias "versionStyleSuffix-1.2-more.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "versionStyleSuffix-1.2-more.qml"
)
set(trickypaths_resource_files
"data/trickypaths.qml"
@@ -62,7 +62,7 @@ add_qt_resource(tst_qmlcachegen "trickypaths"
${trickypaths_resource_files}
)
set_source_files_properties("data/Retain.qml"
- PROPERTIES alias "Retain.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Retain.qml"
)
set(retain_resource_files
"data/Retain.qml"
@@ -100,7 +100,7 @@ add_qt_resource(tst_qmlcachegen "qmake_immediate"
# Resources:
set_source_files_properties("data/umlaut.qml"
- PROPERTIES alias "Bäh.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Bäh.qml"
)
set(trickypaths_umlaut_resource_files
"data/umlaut.qml"
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index 560d712b94..8d96732e1f 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -35,12 +35,12 @@ set_source_files_properties(
data/translation.qml
PROPERTIES
QT_SKIP_QUICKCOMPILER 1
- alias translation.qml
+ QT_RESOURCE_ALIAS translation.qml
)
set_source_files_properties(
data/qml_fr.qm
PROPERTIES
- alias qml_fr.qm
+ QT_RESOURCE_ALIAS qml_fr.qm
)
# special case end
add_qt_resource(tst_qqmltranslation "translation"
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index bb32a2426f..f31cb3d0fd 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -30,7 +30,7 @@ add_qt_test(tst_qquickfolderlistmodel
)
# special case begin
-set_source_files_properties(data/txtdir/hello.txt PROPERTIES alias "txtdir/hello.txt")
+set_source_files_properties(data/txtdir/hello.txt PROPERTIES QT_RESOURCE_ALIAS "txtdir/hello.txt")
# special case end
# Resources:
add_qt_resource(tst_qquickfolderlistmodel "introspect"
diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt
index a6a1234f3c..473115e384 100644
--- a/tests/auto/qml/qrcqml/CMakeLists.txt
+++ b/tests/auto/qml/qrcqml/CMakeLists.txt
@@ -15,13 +15,13 @@ add_qt_test(tst_qrcqml
# Resources:
set_source_files_properties("data/SameDir2.qml"
- PROPERTIES alias "SameDir.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SameDir.qml"
)
set_source_files_properties("data/importtest.qml"
- PROPERTIES alias "importtest.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "importtest.qml"
)
set_source_files_properties("data/main2.qml"
- PROPERTIES alias "main.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "main.qml"
)
add_qt_resource(tst_qrcqml "qrcqml"
PREFIX
@@ -35,10 +35,10 @@ add_qt_resource(tst_qrcqml "qrcqml"
data/main2.qml
)
set_source_files_properties("data/SameDir3.qml"
- PROPERTIES alias "SameDir.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SameDir.qml"
)
set_source_files_properties("data/main3.qml"
- PROPERTIES alias "main.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "main.qml"
)
add_qt_resource(tst_qrcqml "qrcqml1"
PREFIX
@@ -48,7 +48,7 @@ add_qt_resource(tst_qrcqml "qrcqml1"
data/main3.qml
)
set_source_files_properties("data/SubDir.qml"
- PROPERTIES alias "SubDir.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SubDir.qml"
)
add_qt_resource(tst_qrcqml "qrcqml2"
PREFIX
@@ -57,10 +57,10 @@ add_qt_resource(tst_qrcqml "qrcqml2"
data/SubDir.qml
)
set_source_files_properties("data/imports/QrcImport/Imported.qml"
- PROPERTIES alias "QrcImport/Imported.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "QrcImport/Imported.qml"
)
set_source_files_properties("data/imports/QrcImport/qmldir"
- PROPERTIES alias "QrcImport/qmldir"
+ PROPERTIES QT_RESOURCE_ALIAS "QrcImport/qmldir"
)
add_qt_resource(tst_qrcqml "qrcqml3"
PREFIX
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt
index 967d2da8b2..631351d035 100644
--- a/tests/manual/mousearea/CMakeLists.txt
+++ b/tests/manual/mousearea/CMakeLists.txt
@@ -23,37 +23,37 @@ add_qt_resource(mousearea "qml"
plainMouseArea.qml
)
set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES alias "Button.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
)
set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES alias "CheckBox.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
)
set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES alias "Label.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
)
set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES alias "LauncherList.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
)
set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES alias "SimpleLauncherDelegate.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
)
set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES alias "Slider.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
)
set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES alias "TextField.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
)
set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES alias "images/back.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
)
set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES alias "images/checkmark.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
)
set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES alias "images/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
)
set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES alias "images/slider_handle.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
)
add_qt_resource(mousearea "quick_shared"
PREFIX
diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index 64eae0e1bd..fef6bdafc1 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -68,37 +68,37 @@ add_qt_resource(pointer "qml"
tapHandler.qml
)
set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES alias "Button.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
)
set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES alias "CheckBox.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
)
set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES alias "Label.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
)
set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES alias "LauncherList.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
)
set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES alias "SimpleLauncherDelegate.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
)
set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES alias "Slider.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
)
set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES alias "TextField.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
)
set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES alias "images/back.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
)
set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES alias "images/checkmark.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
)
set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES alias "images/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
)
set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES alias "images/slider_handle.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
)
add_qt_resource(pointer "quick_shared"
PREFIX
diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt
index d81e243799..e083a37f4b 100644
--- a/tests/manual/text/CMakeLists.txt
+++ b/tests/manual/text/CMakeLists.txt
@@ -24,37 +24,37 @@ add_qt_resource(text "qml"
textInputPropertiesAndSignals.qml
)
set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES alias "Button.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
)
set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES alias "CheckBox.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
)
set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES alias "Label.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
)
set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES alias "LauncherList.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
)
set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES alias "SimpleLauncherDelegate.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
)
set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES alias "Slider.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
)
set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES alias "TextField.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
)
set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES alias "images/back.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
)
set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES alias "images/checkmark.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
)
set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES alias "images/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
)
set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES alias "images/slider_handle.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
)
add_qt_resource(text "quick_shared"
PREFIX
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 5d49a55486..040ac91607 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -24,37 +24,37 @@ add_qt_resource(touch "qml"
mpta-crosshairs.qml
)
set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES alias "Button.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
)
set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES alias "CheckBox.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
)
set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES alias "Label.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
)
set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES alias "LauncherList.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
)
set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES alias "SimpleLauncherDelegate.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
)
set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES alias "Slider.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
)
set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES alias "TextField.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
)
set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES alias "images/back.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
)
set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES alias "images/checkmark.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
)
set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES alias "images/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
)
set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES alias "images/slider_handle.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
)
add_qt_resource(touch "quick_shared"
PREFIX
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 21:07:51 +0000