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/manual | |
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/manual')
-rw-r--r-- | tests/manual/mousearea/CMakeLists.txt | 55 | ||||
-rw-r--r-- | tests/manual/pointer/CMakeLists.txt | 55 | ||||
-rw-r--r-- | tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt | 170 | ||||
-rw-r--r-- | tests/manual/text/CMakeLists.txt | 56 | ||||
-rw-r--r-- | tests/manual/touch/CMakeLists.txt | 56 |
5 files changed, 80 insertions, 312 deletions
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt index 8b1a56018b..98f1feee3b 100644 --- a/tests/manual/mousearea/CMakeLists.txt +++ b/tests/manual/mousearea/CMakeLists.txt @@ -26,51 +26,18 @@ qt_internal_add_resource(mousearea "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../../../examples/quick/shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../../examples/quick/shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../../examples/quick/shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../../examples/quick/shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../../examples/quick/shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../../examples/quick/shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../../examples/quick/shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../../examples/quick/shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../../examples/quick/shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) set(quick_shared_resource_files - "Button.qml" - "CheckBox.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/slider_handle.png" + "../../../examples/quick/shared/Button.qml" + "../../../examples/quick/shared/CheckBox.qml" + "../../../examples/quick/shared/Label.qml" + "../../../examples/quick/shared/LauncherList.qml" + "../../../examples/quick/shared/SimpleLauncherDelegate.qml" + "../../../examples/quick/shared/Slider.qml" + "../../../examples/quick/shared/TextField.qml" + "../../../examples/quick/shared/images/back.png" + "../../../examples/quick/shared/images/checkmark.png" + "../../../examples/quick/shared/images/next.png" + "../../../examples/quick/shared/images/slider_handle.png" ) qt_internal_add_resource(mousearea "quick_shared" diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index aa3af125dc..d20310aaa8 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -75,51 +75,18 @@ qt_internal_add_resource(pointer "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../../../examples/quick/shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../../examples/quick/shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../../examples/quick/shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../../examples/quick/shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../../examples/quick/shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../../examples/quick/shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../../examples/quick/shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../../examples/quick/shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../../examples/quick/shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) set(quick_shared_resource_files - "Button.qml" - "CheckBox.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/slider_handle.png" + "../../../examples/quick/shared/Button.qml" + "../../../examples/quick/shared/CheckBox.qml" + "../../../examples/quick/shared/Label.qml" + "../../../examples/quick/shared/LauncherList.qml" + "../../../examples/quick/shared/SimpleLauncherDelegate.qml" + "../../../examples/quick/shared/Slider.qml" + "../../../examples/quick/shared/TextField.qml" + "../../../examples/quick/shared/images/back.png" + "../../../examples/quick/shared/images/checkmark.png" + "../../../examples/quick/shared/images/next.png" + "../../../examples/quick/shared/images/slider_handle.png" ) qt_internal_add_resource(pointer "quick_shared" diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt index abf5f648dd..b324ac3685 100644 --- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt @@ -14,143 +14,41 @@ qt_internal_add_manual_test(qmlscenegrabber ) # Resources: -set_source_files_properties("../data/shared/shaders/+qsb/basic.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/basic.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/basic_alpha.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/basic_alpha.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/cmyk.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/cmyk.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/culling.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/culling.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/desaturate.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/desaturate.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/edge.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/edge.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradient.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradient2.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient2.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradient3.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient3.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradient4.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient4.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradient5.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient5.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/gradientgrid.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradientgrid.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/property.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/property.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/shadow.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/shadow.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/stencil.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/stencil.frag" -) -set_source_files_properties("../data/shared/shaders/+qsb/subrect.vert" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/subrect.vert" -) -set_source_files_properties("../data/shared/shaders/+qsb/wave.vert" - PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/wave.vert" -) -set_source_files_properties("../data/shared/shaders/basic.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/basic.frag" -) -set_source_files_properties("../data/shared/shaders/basic_alpha.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/basic_alpha.frag" -) -set_source_files_properties("../data/shared/shaders/cmyk.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/cmyk.frag" -) -set_source_files_properties("../data/shared/shaders/culling.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/culling.frag" -) -set_source_files_properties("../data/shared/shaders/desaturate.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/desaturate.frag" -) -set_source_files_properties("../data/shared/shaders/edge.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/edge.frag" -) -set_source_files_properties("../data/shared/shaders/gradient.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient.frag" -) -set_source_files_properties("../data/shared/shaders/gradient2.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient2.frag" -) -set_source_files_properties("../data/shared/shaders/gradient3.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient3.frag" -) -set_source_files_properties("../data/shared/shaders/gradient4.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient4.frag" -) -set_source_files_properties("../data/shared/shaders/gradient5.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient5.frag" -) -set_source_files_properties("../data/shared/shaders/gradientgrid.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/gradientgrid.frag" -) -set_source_files_properties("../data/shared/shaders/property.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/property.frag" -) -set_source_files_properties("../data/shared/shaders/shadow.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/shadow.frag" -) -set_source_files_properties("../data/shared/shaders/stencil.frag" - PROPERTIES QT_RESOURCE_ALIAS "shaders/stencil.frag" -) -set_source_files_properties("../data/shared/shaders/subrect.vert" - PROPERTIES QT_RESOURCE_ALIAS "shaders/subrect.vert" -) -set_source_files_properties("../data/shared/shaders/wave.vert" - PROPERTIES QT_RESOURCE_ALIAS "shaders/wave.vert" -) set(shared_resource_files - "shaders/+qsb/basic.frag" - "shaders/+qsb/basic_alpha.frag" - "shaders/+qsb/cmyk.frag" - "shaders/+qsb/culling.frag" - "shaders/+qsb/desaturate.frag" - "shaders/+qsb/edge.frag" - "shaders/+qsb/gradient.frag" - "shaders/+qsb/gradient2.frag" - "shaders/+qsb/gradient3.frag" - "shaders/+qsb/gradient4.frag" - "shaders/+qsb/gradient5.frag" - "shaders/+qsb/gradientgrid.frag" - "shaders/+qsb/property.frag" - "shaders/+qsb/shadow.frag" - "shaders/+qsb/stencil.frag" - "shaders/+qsb/subrect.vert" - "shaders/+qsb/wave.vert" - "shaders/basic.frag" - "shaders/basic_alpha.frag" - "shaders/cmyk.frag" - "shaders/culling.frag" - "shaders/desaturate.frag" - "shaders/edge.frag" - "shaders/gradient.frag" - "shaders/gradient2.frag" - "shaders/gradient3.frag" - "shaders/gradient4.frag" - "shaders/gradient5.frag" - "shaders/gradientgrid.frag" - "shaders/property.frag" - "shaders/shadow.frag" - "shaders/stencil.frag" - "shaders/subrect.vert" - "shaders/wave.vert" + "../data/shared/shaders/+qsb/basic.frag" + "../data/shared/shaders/+qsb/basic_alpha.frag" + "../data/shared/shaders/+qsb/cmyk.frag" + "../data/shared/shaders/+qsb/culling.frag" + "../data/shared/shaders/+qsb/desaturate.frag" + "../data/shared/shaders/+qsb/edge.frag" + "../data/shared/shaders/+qsb/gradient.frag" + "../data/shared/shaders/+qsb/gradient2.frag" + "../data/shared/shaders/+qsb/gradient3.frag" + "../data/shared/shaders/+qsb/gradient4.frag" + "../data/shared/shaders/+qsb/gradient5.frag" + "../data/shared/shaders/+qsb/gradientgrid.frag" + "../data/shared/shaders/+qsb/property.frag" + "../data/shared/shaders/+qsb/shadow.frag" + "../data/shared/shaders/+qsb/stencil.frag" + "../data/shared/shaders/+qsb/subrect.vert" + "../data/shared/shaders/+qsb/wave.vert" + "../data/shared/shaders/basic.frag" + "../data/shared/shaders/basic_alpha.frag" + "../data/shared/shaders/cmyk.frag" + "../data/shared/shaders/culling.frag" + "../data/shared/shaders/desaturate.frag" + "../data/shared/shaders/edge.frag" + "../data/shared/shaders/gradient.frag" + "../data/shared/shaders/gradient2.frag" + "../data/shared/shaders/gradient3.frag" + "../data/shared/shaders/gradient4.frag" + "../data/shared/shaders/gradient5.frag" + "../data/shared/shaders/gradientgrid.frag" + "../data/shared/shaders/property.frag" + "../data/shared/shaders/shadow.frag" + "../data/shared/shaders/stencil.frag" + "../data/shared/shaders/subrect.vert" + "../data/shared/shaders/wave.vert" ) qt_internal_add_resource(qmlscenegrabber "shared" diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt index 78c07f6ca8..524dedbcb0 100644 --- a/tests/manual/text/CMakeLists.txt +++ b/tests/manual/text/CMakeLists.txt @@ -27,51 +27,19 @@ qt_internal_add_resource(text "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../../../examples/quick/shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../../examples/quick/shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../../examples/quick/shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../../examples/quick/shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../../examples/quick/shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../../examples/quick/shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../../examples/quick/shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../../examples/quick/shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../../examples/quick/shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) + set(quick_shared_resource_files - "Button.qml" - "CheckBox.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/slider_handle.png" + "../../../examples/quick/shared/Button.qml" + "../../../examples/quick/shared/CheckBox.qml" + "../../../examples/quick/shared/Label.qml" + "../../../examples/quick/shared/LauncherList.qml" + "../../../examples/quick/shared/SimpleLauncherDelegate.qml" + "../../../examples/quick/shared/Slider.qml" + "../../../examples/quick/shared/TextField.qml" + "../../../examples/quick/shared/images/back.png" + "../../../examples/quick/shared/images/checkmark.png" + "../../../examples/quick/shared/images/next.png" + "../../../examples/quick/shared/images/slider_handle.png" ) qt_internal_add_resource(text "quick_shared" diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 28e26e30c3..51e6022c9a 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -27,51 +27,19 @@ qt_internal_add_resource(touch "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../../../examples/quick/shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../../examples/quick/shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../../examples/quick/shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../../examples/quick/shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../../examples/quick/shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../../examples/quick/shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../../examples/quick/shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../../examples/quick/shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../../examples/quick/shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) + set(quick_shared_resource_files - "Button.qml" - "CheckBox.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/slider_handle.png" + "../../../examples/quick/shared/Button.qml" + "../../../examples/quick/shared/CheckBox.qml" + "../../../examples/quick/shared/Label.qml" + "../../../examples/quick/shared/LauncherList.qml" + "../../../examples/quick/shared/SimpleLauncherDelegate.qml" + "../../../examples/quick/shared/Slider.qml" + "../../../examples/quick/shared/TextField.qml" + "../../../examples/quick/shared/images/back.png" + "../../../examples/quick/shared/images/checkmark.png" + "../../../examples/quick/shared/images/next.png" + "../../../examples/quick/shared/images/slider_handle.png" ) qt_internal_add_resource(touch "quick_shared" |