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 | |
| 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)
31 files changed, 608 insertions, 2252 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fd17f4a3c1..b8e843afb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,9 @@ project(QtDeclarative # special case # special case begin # Make sure we only use latest private CMake API, aka no compatibility wrappers. set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) + +# Make sure we use the fixed BASE argument of qt_add_resource. +set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) # special case end find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt index 235c14325f..ebb0d0c011 100644 --- a/examples/qml/xmlhttprequest/CMakeLists.txt +++ b/examples/qml/xmlhttprequest/CMakeLists.txt @@ -50,51 +50,18 @@ qt6_add_resources(xmlhttprequest "xmlhttprequest" FILES ${xmlhttprequest_resource_files} ) -set_source_files_properties("../../quick/shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../quick/shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../quick/shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../quick/shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../quick/shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../quick/shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../quick/shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../quick/shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../quick/shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../quick/shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../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" + "../../quick/shared/Button.qml" + "../../quick/shared/CheckBox.qml" + "../../quick/shared/Label.qml" + "../../quick/shared/LauncherList.qml" + "../../quick/shared/SimpleLauncherDelegate.qml" + "../../quick/shared/Slider.qml" + "../../quick/shared/TextField.qml" + "../../quick/shared/images/back.png" + "../../quick/shared/images/checkmark.png" + "../../quick/shared/images/next.png" + "../../quick/shared/images/slider_handle.png" ) qt6_add_resources(xmlhttprequest "quick_shared" diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt index 4352823374..2f47a43d93 100644 --- a/examples/quick/animation/CMakeLists.txt +++ b/examples/quick/animation/CMakeLists.txt @@ -36,67 +36,22 @@ target_link_libraries(animation PUBLIC # Resources: -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(animation "shared" diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt index ef978ee80b..9cf589846e 100644 --- a/examples/quick/canvas/CMakeLists.txt +++ b/examples/quick/canvas/CMakeLists.txt @@ -56,67 +56,22 @@ qt6_add_resources(canvas "canvas" FILES ${canvas_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(canvas "shared" diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt index dc45ad5c3c..ab9d1537ac 100644 --- a/examples/quick/delegatechooser/CMakeLists.txt +++ b/examples/quick/delegatechooser/CMakeLists.txt @@ -46,67 +46,22 @@ qt6_add_resources(delegatechooser "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(delegatechooser "shared" diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt index fe0107938a..2f84c9cca8 100644 --- a/examples/quick/draganddrop/CMakeLists.txt +++ b/examples/quick/draganddrop/CMakeLists.txt @@ -51,67 +51,22 @@ qt6_add_resources(draganddrop "draganddrop" FILES ${draganddrop_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(draganddrop "shared" diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt index 2f801b3045..26a9f7271c 100644 --- a/examples/quick/externaldraganddrop/CMakeLists.txt +++ b/examples/quick/externaldraganddrop/CMakeLists.txt @@ -47,67 +47,22 @@ qt6_add_resources(externaldraganddrop "externaldraganddrop" FILES ${externaldraganddrop_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(externaldraganddrop "shared" diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index ea354c3305..1ffb16694d 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -69,67 +69,22 @@ qt6_add_resources(imageelements "imageelements" FILES ${imageelements_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(imageelements "shared" diff --git a/examples/quick/localstorage/localstorage/CMakeLists.txt b/examples/quick/localstorage/localstorage/CMakeLists.txt index db32a5e2eb..b8778545cb 100644 --- a/examples/quick/localstorage/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/localstorage/CMakeLists.txt @@ -51,67 +51,22 @@ qt6_add_resources(localstorage "localstorage" FILES ${localstorage_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(localstorage "shared" diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 1e65a15d2e..4766ee1100 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -57,131 +57,38 @@ qt6_add_resources(affectors "affectors" FILES ${affectors_resource_files} ) -set_source_files_properties("../images/_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" -) -set_source_files_properties("../images/backgroundLeaves.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg" -) -set_source_files_properties("../images/bear_tiles.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png" -) -set_source_files_properties("../images/candle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/candle.png" -) -set_source_files_properties("../images/colortable.png" - PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png" -) -set_source_files_properties("../images/finalfrontier.png" - PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png" -) -set_source_files_properties("../images/flower.png" - PROPERTIES QT_RESOURCE_ALIAS "images/flower.png" -) -set_source_files_properties("../images/matchmask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png" -) -set_source_files_properties("../images/meteor.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png" -) -set_source_files_properties("../images/meteor_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png" -) -set_source_files_properties("../images/meteors.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png" -) -set_source_files_properties("../images/nullRock.png" - PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png" -) -set_source_files_properties("../images/particle2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png" -) -set_source_files_properties("../images/particle3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png" -) -set_source_files_properties("../images/particleA.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png" -) -set_source_files_properties("../images/portal_bg.png" - PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png" -) -set_source_files_properties("../images/realLeaf1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png" -) -set_source_files_properties("../images/realLeaf2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png" -) -set_source_files_properties("../images/realLeaf3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png" -) -set_source_files_properties("../images/realLeaf4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png" -) -set_source_files_properties("../images/rocket.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png" -) -set_source_files_properties("../images/rocket2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png" -) -set_source_files_properties("../images/sizeInOut.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png" -) -set_source_files_properties("../images/snowflake.png" - PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png" -) -set_source_files_properties("../images/sparkleSize.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png" -) -set_source_files_properties("../images/starfish_0.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png" -) -set_source_files_properties("../images/starfish_1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png" -) -set_source_files_properties("../images/starfish_2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png" -) -set_source_files_properties("../images/starfish_3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png" -) -set_source_files_properties("../images/starfish_4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png" -) -set_source_files_properties("../images/starfish_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png" -) set(images_resource_files - "images/_explo.png" - "images/backgroundLeaves.jpg" - "images/bear_tiles.png" - "images/candle.png" - "images/colortable.png" - "images/finalfrontier.png" - "images/flower.png" - "images/matchmask.png" - "images/meteor.png" - "images/meteor_explo.png" - "images/meteors.png" - "images/nullRock.png" - "images/particle2.png" - "images/particle3.png" - "images/particleA.png" - "images/portal_bg.png" - "images/realLeaf1.png" - "images/realLeaf2.png" - "images/realLeaf3.png" - "images/realLeaf4.png" - "images/rocket.png" - "images/rocket2.png" - "images/sizeInOut.png" - "images/snowflake.png" - "images/sparkleSize.png" - "images/starfish_0.png" - "images/starfish_1.png" - "images/starfish_2.png" - "images/starfish_3.png" - "images/starfish_4.png" - "images/starfish_mask.png" + "../images/_explo.png" + "../images/backgroundLeaves.jpg" + "../images/bear_tiles.png" + "../images/candle.png" + "../images/colortable.png" + "../images/finalfrontier.png" + "../images/flower.png" + "../images/matchmask.png" + "../images/meteor.png" + "../images/meteor_explo.png" + "../images/meteors.png" + "../images/nullRock.png" + "../images/particle2.png" + "../images/particle3.png" + "../images/particleA.png" + "../images/portal_bg.png" + "../images/realLeaf1.png" + "../images/realLeaf2.png" + "../images/realLeaf3.png" + "../images/realLeaf4.png" + "../images/rocket.png" + "../images/rocket2.png" + "../images/sizeInOut.png" + "../images/snowflake.png" + "../images/sparkleSize.png" + "../images/starfish_0.png" + "../images/starfish_1.png" + "../images/starfish_2.png" + "../images/starfish_3.png" + "../images/starfish_4.png" + "../images/starfish_mask.png" ) qt6_add_resources(affectors "images" @@ -192,67 +99,22 @@ qt6_add_resources(affectors "images" FILES ${images_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(affectors "shared" diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index a6ca0875ce..37295148fa 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -53,131 +53,38 @@ qt6_add_resources(emitters "emitters" FILES ${emitters_resource_files} ) -set_source_files_properties("../images/_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" -) -set_source_files_properties("../images/backgroundLeaves.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg" -) -set_source_files_properties("../images/bear_tiles.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png" -) -set_source_files_properties("../images/candle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/candle.png" -) -set_source_files_properties("../images/colortable.png" - PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png" -) -set_source_files_properties("../images/finalfrontier.png" - PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png" -) -set_source_files_properties("../images/flower.png" - PROPERTIES QT_RESOURCE_ALIAS "images/flower.png" -) -set_source_files_properties("../images/matchmask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png" -) -set_source_files_properties("../images/meteor.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png" -) -set_source_files_properties("../images/meteor_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png" -) -set_source_files_properties("../images/meteors.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png" -) -set_source_files_properties("../images/nullRock.png" - PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png" -) -set_source_files_properties("../images/particle2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png" -) -set_source_files_properties("../images/particle3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png" -) -set_source_files_properties("../images/particleA.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png" -) -set_source_files_properties("../images/portal_bg.png" - PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png" -) -set_source_files_properties("../images/realLeaf1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png" -) -set_source_files_properties("../images/realLeaf2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png" -) -set_source_files_properties("../images/realLeaf3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png" -) -set_source_files_properties("../images/realLeaf4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png" -) -set_source_files_properties("../images/rocket.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png" -) -set_source_files_properties("../images/rocket2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png" -) -set_source_files_properties("../images/sizeInOut.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png" -) -set_source_files_properties("../images/snowflake.png" - PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png" -) -set_source_files_properties("../images/sparkleSize.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png" -) -set_source_files_properties("../images/starfish_0.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png" -) -set_source_files_properties("../images/starfish_1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png" -) -set_source_files_properties("../images/starfish_2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png" -) -set_source_files_properties("../images/starfish_3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png" -) -set_source_files_properties("../images/starfish_4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png" -) -set_source_files_properties("../images/starfish_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png" -) set(images_resource_files - "images/_explo.png" - "images/backgroundLeaves.jpg" - "images/bear_tiles.png" - "images/candle.png" - "images/colortable.png" - "images/finalfrontier.png" - "images/flower.png" - "images/matchmask.png" - "images/meteor.png" - "images/meteor_explo.png" - "images/meteors.png" - "images/nullRock.png" - "images/particle2.png" - "images/particle3.png" - "images/particleA.png" - "images/portal_bg.png" - "images/realLeaf1.png" - "images/realLeaf2.png" - "images/realLeaf3.png" - "images/realLeaf4.png" - "images/rocket.png" - "images/rocket2.png" - "images/sizeInOut.png" - "images/snowflake.png" - "images/sparkleSize.png" - "images/starfish_0.png" - "images/starfish_1.png" - "images/starfish_2.png" - "images/starfish_3.png" - "images/starfish_4.png" - "images/starfish_mask.png" + "../images/_explo.png" + "../images/backgroundLeaves.jpg" + "../images/bear_tiles.png" + "../images/candle.png" + "../images/colortable.png" + "../images/finalfrontier.png" + "../images/flower.png" + "../images/matchmask.png" + "../images/meteor.png" + "../images/meteor_explo.png" + "../images/meteors.png" + "../images/nullRock.png" + "../images/particle2.png" + "../images/particle3.png" + "../images/particleA.png" + "../images/portal_bg.png" + "../images/realLeaf1.png" + "../images/realLeaf2.png" + "../images/realLeaf3.png" + "../images/realLeaf4.png" + "../images/rocket.png" + "../images/rocket2.png" + "../images/sizeInOut.png" + "../images/snowflake.png" + "../images/sparkleSize.png" + "../images/starfish_0.png" + "../images/starfish_1.png" + "../images/starfish_2.png" + "../images/starfish_3.png" + "../images/starfish_4.png" + "../images/starfish_mask.png" ) qt6_add_resources(emitters "images" @@ -188,67 +95,22 @@ qt6_add_resources(emitters "images" FILES ${images_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(emitters "shared" diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index 29bddbb0db..2bc34b3532 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -53,131 +53,38 @@ qt6_add_resources(imageparticle "imageparticle" FILES ${imageparticle_resource_files} ) -set_source_files_properties("../images/_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" -) -set_source_files_properties("../images/backgroundLeaves.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg" -) -set_source_files_properties("../images/bear_tiles.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png" -) -set_source_files_properties("../images/candle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/candle.png" -) -set_source_files_properties("../images/colortable.png" - PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png" -) -set_source_files_properties("../images/finalfrontier.png" - PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png" -) -set_source_files_properties("../images/flower.png" - PROPERTIES QT_RESOURCE_ALIAS "images/flower.png" -) -set_source_files_properties("../images/matchmask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png" -) -set_source_files_properties("../images/meteor.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png" -) -set_source_files_properties("../images/meteor_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png" -) -set_source_files_properties("../images/meteors.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png" -) -set_source_files_properties("../images/nullRock.png" - PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png" -) -set_source_files_properties("../images/particle2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png" -) -set_source_files_properties("../images/particle3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png" -) -set_source_files_properties("../images/particleA.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png" -) -set_source_files_properties("../images/portal_bg.png" - PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png" -) -set_source_files_properties("../images/realLeaf1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png" -) -set_source_files_properties("../images/realLeaf2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png" -) -set_source_files_properties("../images/realLeaf3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png" -) -set_source_files_properties("../images/realLeaf4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png" -) -set_source_files_properties("../images/rocket.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png" -) -set_source_files_properties("../images/rocket2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png" -) -set_source_files_properties("../images/sizeInOut.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png" -) -set_source_files_properties("../images/snowflake.png" - PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png" -) -set_source_files_properties("../images/sparkleSize.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png" -) -set_source_files_properties("../images/starfish_0.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png" -) -set_source_files_properties("../images/starfish_1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png" -) -set_source_files_properties("../images/starfish_2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png" -) -set_source_files_properties("../images/starfish_3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png" -) -set_source_files_properties("../images/starfish_4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png" -) -set_source_files_properties("../images/starfish_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png" -) set(images_resource_files - "images/_explo.png" - "images/backgroundLeaves.jpg" - "images/bear_tiles.png" - "images/candle.png" - "images/colortable.png" - "images/finalfrontier.png" - "images/flower.png" - "images/matchmask.png" - "images/meteor.png" - "images/meteor_explo.png" - "images/meteors.png" - "images/nullRock.png" - "images/particle2.png" - "images/particle3.png" - "images/particleA.png" - "images/portal_bg.png" - "images/realLeaf1.png" - "images/realLeaf2.png" - "images/realLeaf3.png" - "images/realLeaf4.png" - "images/rocket.png" - "images/rocket2.png" - "images/sizeInOut.png" - "images/snowflake.png" - "images/sparkleSize.png" - "images/starfish_0.png" - "images/starfish_1.png" - "images/starfish_2.png" - "images/starfish_3.png" - "images/starfish_4.png" - "images/starfish_mask.png" + "../images/_explo.png" + "../images/backgroundLeaves.jpg" + "../images/bear_tiles.png" + "../images/candle.png" + "../images/colortable.png" + "../images/finalfrontier.png" + "../images/flower.png" + "../images/matchmask.png" + "../images/meteor.png" + "../images/meteor_explo.png" + "../images/meteors.png" + "../images/nullRock.png" + "../images/particle2.png" + "../images/particle3.png" + "../images/particleA.png" + "../images/portal_bg.png" + "../images/realLeaf1.png" + "../images/realLeaf2.png" + "../images/realLeaf3.png" + "../images/realLeaf4.png" + "../images/rocket.png" + "../images/rocket2.png" + "../images/sizeInOut.png" + "../images/snowflake.png" + "../images/sparkleSize.png" + "../images/starfish_0.png" + "../images/starfish_1.png" + "../images/starfish_2.png" + "../images/starfish_3.png" + "../images/starfish_4.png" + "../images/starfish_mask.png" ) qt6_add_resources(imageparticle "images" @@ -188,67 +95,22 @@ qt6_add_resources(imageparticle "images" FILES ${images_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(imageparticle "shared" diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index bb88ffb633..80c63de81f 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -46,131 +46,38 @@ foreach(file IN LISTS resource_glob_1) endforeach() # Resources: -set_source_files_properties("../images/_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" -) -set_source_files_properties("../images/backgroundLeaves.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg" -) -set_source_files_properties("../images/bear_tiles.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png" -) -set_source_files_properties("../images/candle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/candle.png" -) -set_source_files_properties("../images/colortable.png" - PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png" -) -set_source_files_properties("../images/finalfrontier.png" - PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png" -) -set_source_files_properties("../images/flower.png" - PROPERTIES QT_RESOURCE_ALIAS "images/flower.png" -) -set_source_files_properties("../images/matchmask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png" -) -set_source_files_properties("../images/meteor.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png" -) -set_source_files_properties("../images/meteor_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png" -) -set_source_files_properties("../images/meteors.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png" -) -set_source_files_properties("../images/nullRock.png" - PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png" -) -set_source_files_properties("../images/particle2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png" -) -set_source_files_properties("../images/particle3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png" -) -set_source_files_properties("../images/particleA.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png" -) -set_source_files_properties("../images/portal_bg.png" - PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png" -) -set_source_files_properties("../images/realLeaf1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png" -) -set_source_files_properties("../images/realLeaf2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png" -) -set_source_files_properties("../images/realLeaf3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png" -) -set_source_files_properties("../images/realLeaf4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png" -) -set_source_files_properties("../images/rocket.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png" -) -set_source_files_properties("../images/rocket2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png" -) -set_source_files_properties("../images/sizeInOut.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png" -) -set_source_files_properties("../images/snowflake.png" - PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png" -) -set_source_files_properties("../images/sparkleSize.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png" -) -set_source_files_properties("../images/starfish_0.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png" -) -set_source_files_properties("../images/starfish_1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png" -) -set_source_files_properties("../images/starfish_2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png" -) -set_source_files_properties("../images/starfish_3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png" -) -set_source_files_properties("../images/starfish_4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png" -) -set_source_files_properties("../images/starfish_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png" -) set(images_resource_files - "images/_explo.png" - "images/backgroundLeaves.jpg" - "images/bear_tiles.png" - "images/candle.png" - "images/colortable.png" - "images/finalfrontier.png" - "images/flower.png" - "images/matchmask.png" - "images/meteor.png" - "images/meteor_explo.png" - "images/meteors.png" - "images/nullRock.png" - "images/particle2.png" - "images/particle3.png" - "images/particleA.png" - "images/portal_bg.png" - "images/realLeaf1.png" - "images/realLeaf2.png" - "images/realLeaf3.png" - "images/realLeaf4.png" - "images/rocket.png" - "images/rocket2.png" - "images/sizeInOut.png" - "images/snowflake.png" - "images/sparkleSize.png" - "images/starfish_0.png" - "images/starfish_1.png" - "images/starfish_2.png" - "images/starfish_3.png" - "images/starfish_4.png" - "images/starfish_mask.png" + "../images/_explo.png" + "../images/backgroundLeaves.jpg" + "../images/bear_tiles.png" + "../images/candle.png" + "../images/colortable.png" + "../images/finalfrontier.png" + "../images/flower.png" + "../images/matchmask.png" + "../images/meteor.png" + "../images/meteor_explo.png" + "../images/meteors.png" + "../images/nullRock.png" + "../images/particle2.png" + "../images/particle3.png" + "../images/particleA.png" + "../images/portal_bg.png" + "../images/realLeaf1.png" + "../images/realLeaf2.png" + "../images/realLeaf3.png" + "../images/realLeaf4.png" + "../images/rocket.png" + "../images/rocket2.png" + "../images/sizeInOut.png" + "../images/snowflake.png" + "../images/sparkleSize.png" + "../images/starfish_0.png" + "../images/starfish_1.png" + "../images/starfish_2.png" + "../images/starfish_3.png" + "../images/starfish_4.png" + "../images/starfish_mask.png" ) qt6_add_resources(itemparticle "images" @@ -181,67 +88,22 @@ qt6_add_resources(itemparticle "images" FILES ${images_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(itemparticle "shared" diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index 737dc5f90b..91c754786f 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -51,131 +51,38 @@ qt6_add_resources(system "system" FILES ${system_resource_files} ) -set_source_files_properties("../images/_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png" -) -set_source_files_properties("../images/backgroundLeaves.jpg" - PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg" -) -set_source_files_properties("../images/bear_tiles.png" - PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png" -) -set_source_files_properties("../images/candle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/candle.png" -) -set_source_files_properties("../images/colortable.png" - PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png" -) -set_source_files_properties("../images/finalfrontier.png" - PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png" -) -set_source_files_properties("../images/flower.png" - PROPERTIES QT_RESOURCE_ALIAS "images/flower.png" -) -set_source_files_properties("../images/matchmask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png" -) -set_source_files_properties("../images/meteor.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png" -) -set_source_files_properties("../images/meteor_explo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png" -) -set_source_files_properties("../images/meteors.png" - PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png" -) -set_source_files_properties("../images/nullRock.png" - PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png" -) -set_source_files_properties("../images/particle2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png" -) -set_source_files_properties("../images/particle3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png" -) -set_source_files_properties("../images/particleA.png" - PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png" -) -set_source_files_properties("../images/portal_bg.png" - PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png" -) -set_source_files_properties("../images/realLeaf1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png" -) -set_source_files_properties("../images/realLeaf2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png" -) -set_source_files_properties("../images/realLeaf3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png" -) -set_source_files_properties("../images/realLeaf4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png" -) -set_source_files_properties("../images/rocket.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png" -) -set_source_files_properties("../images/rocket2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png" -) -set_source_files_properties("../images/sizeInOut.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png" -) -set_source_files_properties("../images/snowflake.png" - PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png" -) -set_source_files_properties("../images/sparkleSize.png" - PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png" -) -set_source_files_properties("../images/starfish_0.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png" -) -set_source_files_properties("../images/starfish_1.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png" -) -set_source_files_properties("../images/starfish_2.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png" -) -set_source_files_properties("../images/starfish_3.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png" -) -set_source_files_properties("../images/starfish_4.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png" -) -set_source_files_properties("../images/starfish_mask.png" - PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png" -) set(images_resource_files - "images/_explo.png" - "images/backgroundLeaves.jpg" - "images/bear_tiles.png" - "images/candle.png" - "images/colortable.png" - "images/finalfrontier.png" - "images/flower.png" - "images/matchmask.png" - "images/meteor.png" - "images/meteor_explo.png" - "images/meteors.png" - "images/nullRock.png" - "images/particle2.png" - "images/particle3.png" - "images/particleA.png" - "images/portal_bg.png" - "images/realLeaf1.png" - "images/realLeaf2.png" - "images/realLeaf3.png" - "images/realLeaf4.png" - "images/rocket.png" - "images/rocket2.png" - "images/sizeInOut.png" - "images/snowflake.png" - "images/sparkleSize.png" - "images/starfish_0.png" - "images/starfish_1.png" - "images/starfish_2.png" - "images/starfish_3.png" - "images/starfish_4.png" - "images/starfish_mask.png" + "../images/_explo.png" + "../images/backgroundLeaves.jpg" + "../images/bear_tiles.png" + "../images/candle.png" + "../images/colortable.png" + "../images/finalfrontier.png" + "../images/flower.png" + "../images/matchmask.png" + "../images/meteor.png" + "../images/meteor_explo.png" + "../images/meteors.png" + "../images/nullRock.png" + "../images/particle2.png" + "../images/particle3.png" + "../images/particleA.png" + "../images/portal_bg.png" + "../images/realLeaf1.png" + "../images/realLeaf2.png" + "../images/realLeaf3.png" + "../images/realLeaf4.png" + "../images/rocket.png" + "../images/rocket2.png" + "../images/sizeInOut.png" + "../images/snowflake.png" + "../images/sparkleSize.png" + "../images/starfish_0.png" + "../images/starfish_1.png" + "../images/starfish_2.png" + "../images/starfish_3.png" + "../images/starfish_4.png" + "../images/starfish_mask.png" ) qt6_add_resources(system "images" @@ -186,67 +93,22 @@ qt6_add_resources(system "images" FILES ${images_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../../shared/Button.qml" + "../../shared/CheckBox.qml" + "../../shared/FlickrRssModel.qml" + "../../shared/Label.qml" + "../../shared/LauncherList.qml" + "../../shared/SimpleLauncherDelegate.qml" + "../../shared/Slider.qml" + "../../shared/TabSet.qml" + "../../shared/TextField.qml" + "../../shared/images/back.png" + "../../shared/images/checkmark.png" + "../../shared/images/next.png" + "../../shared/images/qt-logo.png" + "../../shared/images/slider_handle.png" + "../../shared/images/tab.png" ) qt6_add_resources(system "shared" diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt index 07205cbfa5..572f53e56c 100644 --- a/examples/quick/positioners/CMakeLists.txt +++ b/examples/quick/positioners/CMakeLists.txt @@ -48,67 +48,22 @@ qt6_add_resources(positioners "positioners" FILES ${positioners_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(positioners "shared" diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt index 5faf4bda61..377792aced 100644 --- a/examples/quick/righttoleft/CMakeLists.txt +++ b/examples/quick/righttoleft/CMakeLists.txt @@ -49,67 +49,22 @@ qt6_add_resources(righttoleft "righttoleft" FILES ${righttoleft_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(righttoleft "shared" diff --git a/examples/quick/text/.prev_CMakeLists.txt b/examples/quick/text/.prev_CMakeLists.txt index 20d4228bcf..ada8f2b376 100644 --- a/examples/quick/text/.prev_CMakeLists.txt +++ b/examples/quick/text/.prev_CMakeLists.txt @@ -65,67 +65,22 @@ qt6_add_resources(text "text" FILES ${text_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(text "shared" diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index f4e7e7de38..570b0a59df 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -65,67 +65,22 @@ qt6_add_resources(text "text" FILES ${text_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(text "shared" diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt index 3dcc58158e..cb1a13835b 100644 --- a/examples/quick/threading/CMakeLists.txt +++ b/examples/quick/threading/CMakeLists.txt @@ -51,67 +51,22 @@ qt6_add_resources(threading "threading" FILES ${threading_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(threading "shared" diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt index af3219ac7d..4435a6a307 100644 --- a/examples/quick/touchinteraction/CMakeLists.txt +++ b/examples/quick/touchinteraction/CMakeLists.txt @@ -68,67 +68,22 @@ qt6_add_resources(touchinteraction "touchinteraction" FILES ${touchinteraction_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(touchinteraction "shared" diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt index 9951bd48ff..53ced26e55 100644 --- a/examples/quick/views/CMakeLists.txt +++ b/examples/quick/views/CMakeLists.txt @@ -91,67 +91,22 @@ qt6_add_resources(views "views" FILES ${views_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(views "shared" diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt index 4fa2bcac4c..ca9f75b082 100644 --- a/examples/quick/window/CMakeLists.txt +++ b/examples/quick/window/CMakeLists.txt @@ -49,67 +49,22 @@ qt6_add_resources(window "window" FILES ${window_resource_files} ) -set_source_files_properties("../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" + "../shared/Button.qml" + "../shared/CheckBox.qml" + "../shared/FlickrRssModel.qml" + "../shared/Label.qml" + "../shared/LauncherList.qml" + "../shared/SimpleLauncherDelegate.qml" + "../shared/Slider.qml" + "../shared/TabSet.qml" + "../shared/TextField.qml" + "../shared/images/back.png" + "../shared/images/checkmark.png" + "../shared/images/next.png" + "../shared/images/qt-logo.png" + "../shared/images/slider_handle.png" + "../shared/images/tab.png" ) qt6_add_resources(window "shared" diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index f158a40210..ffc1298532 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -221,66 +221,64 @@ qt_internal_add_module(Quick # Resources: set(scenegraph_resource_files - "shaders_ng/24bittextmask.frag.qsb" - "shaders_ng/32bitcolortext.frag.qsb" - "shaders_ng/8bittextmask.frag.qsb" - "shaders_ng/8bittextmask_a.frag.qsb" - "shaders_ng/distancefieldoutlinetext.frag.qsb" - "shaders_ng/distancefieldoutlinetext.vert.qsb" - "shaders_ng/distancefieldoutlinetext_a.frag.qsb" - "shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb" - "shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb" - "shaders_ng/distancefieldshiftedtext.frag.qsb" - "shaders_ng/distancefieldshiftedtext.vert.qsb" - "shaders_ng/distancefieldshiftedtext_a.frag.qsb" - "shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb" - "shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb" - "shaders_ng/distancefieldtext.frag.qsb" - "shaders_ng/distancefieldtext.vert.qsb" - "shaders_ng/distancefieldtext_a.frag.qsb" - "shaders_ng/distancefieldtext_a_fwidth.frag.qsb" - "shaders_ng/distancefieldtext_fwidth.frag.qsb" - "shaders_ng/flatcolor.frag.qsb" - "shaders_ng/flatcolor.vert.qsb" - "shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb" - "shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb" - "shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb" - "shaders_ng/loqsubpixeldistancefieldtext.frag.qsb" - "shaders_ng/loqsubpixeldistancefieldtext.vert.qsb" - "shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb" - "shaders_ng/opaquetexture.frag.qsb" - "shaders_ng/opaquetexture.vert.qsb" - "shaders_ng/outlinedtext.frag.qsb" - "shaders_ng/outlinedtext.vert.qsb" - "shaders_ng/outlinedtext_a.frag.qsb" - "shaders_ng/shadereffect.frag.qsb" - "shaders_ng/shadereffect.vert.qsb" - "shaders_ng/smoothcolor.frag.qsb" - "shaders_ng/smoothcolor.vert.qsb" - "shaders_ng/smoothtexture.frag.qsb" - "shaders_ng/smoothtexture.vert.qsb" - "shaders_ng/sprite.frag.qsb" - "shaders_ng/sprite.vert.qsb" - "shaders_ng/stencilclip.frag.qsb" - "shaders_ng/stencilclip.vert.qsb" - "shaders_ng/styledtext.frag.qsb" - "shaders_ng/styledtext.vert.qsb" - "shaders_ng/styledtext_a.frag.qsb" - "shaders_ng/textmask.frag.qsb" - "shaders_ng/textmask.vert.qsb" - "shaders_ng/texture.frag.qsb" - "shaders_ng/texture.vert.qsb" - "shaders_ng/vertexcolor.frag.qsb" - "shaders_ng/vertexcolor.vert.qsb" - "shaders_ng/visualization.frag.qsb" - "shaders_ng/visualization.vert.qsb" + "scenegraph/shaders_ng/24bittextmask.frag.qsb" + "scenegraph/shaders_ng/32bitcolortext.frag.qsb" + "scenegraph/shaders_ng/8bittextmask.frag.qsb" + "scenegraph/shaders_ng/8bittextmask_a.frag.qsb" + "scenegraph/shaders_ng/distancefieldoutlinetext.frag.qsb" + "scenegraph/shaders_ng/distancefieldoutlinetext.vert.qsb" + "scenegraph/shaders_ng/distancefieldoutlinetext_a.frag.qsb" + "scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb" + "scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb" + "scenegraph/shaders_ng/distancefieldshiftedtext.frag.qsb" + "scenegraph/shaders_ng/distancefieldshiftedtext.vert.qsb" + "scenegraph/shaders_ng/distancefieldshiftedtext_a.frag.qsb" + "scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb" + "scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb" + "scenegraph/shaders_ng/distancefieldtext.frag.qsb" + "scenegraph/shaders_ng/distancefieldtext.vert.qsb" + "scenegraph/shaders_ng/distancefieldtext_a.frag.qsb" + "scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag.qsb" + "scenegraph/shaders_ng/distancefieldtext_fwidth.frag.qsb" + "scenegraph/shaders_ng/flatcolor.frag.qsb" + "scenegraph/shaders_ng/flatcolor.vert.qsb" + "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb" + "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb" + "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb" + "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag.qsb" + "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert.qsb" + "scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb" + "scenegraph/shaders_ng/opaquetexture.frag.qsb" + "scenegraph/shaders_ng/opaquetexture.vert.qsb" + "scenegraph/shaders_ng/outlinedtext.frag.qsb" + "scenegraph/shaders_ng/outlinedtext.vert.qsb" + "scenegraph/shaders_ng/outlinedtext_a.frag.qsb" + "scenegraph/shaders_ng/shadereffect.frag.qsb" + "scenegraph/shaders_ng/shadereffect.vert.qsb" + "scenegraph/shaders_ng/smoothcolor.frag.qsb" + "scenegraph/shaders_ng/smoothcolor.vert.qsb" + "scenegraph/shaders_ng/smoothtexture.frag.qsb" + "scenegraph/shaders_ng/smoothtexture.vert.qsb" + "scenegraph/shaders_ng/sprite.frag.qsb" + "scenegraph/shaders_ng/sprite.vert.qsb" + "scenegraph/shaders_ng/stencilclip.frag.qsb" + "scenegraph/shaders_ng/stencilclip.vert.qsb" + "scenegraph/shaders_ng/styledtext.frag.qsb" + "scenegraph/shaders_ng/styledtext.vert.qsb" + "scenegraph/shaders_ng/styledtext_a.frag.qsb" + "scenegraph/shaders_ng/textmask.frag.qsb" + "scenegraph/shaders_ng/textmask.vert.qsb" + "scenegraph/shaders_ng/texture.frag.qsb" + "scenegraph/shaders_ng/texture.vert.qsb" + "scenegraph/shaders_ng/vertexcolor.frag.qsb" + "scenegraph/shaders_ng/vertexcolor.vert.qsb" + "scenegraph/shaders_ng/visualization.frag.qsb" + "scenegraph/shaders_ng/visualization.vert.qsb" ) qt_internal_add_resource(Quick "scenegraph" PREFIX - "/qt-project.org/scenegraph" - BASE - "scenegraph" + "/qt-project.org" FILES ${scenegraph_resource_files} ) @@ -525,4 +523,3 @@ set_target_properties(Quick PROPERTIES ) qt6_qml_type_registration(Quick) - 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" 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" |