From 9ed32b292fd5fd3a6f1909244bb5c3dd7cc7286b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 18 May 2021 14:23:21 +0200 Subject: Use fixed qt_add_resource BASE argument Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ie638443a76623df0ec20fbcd5485af59866deee6 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- .../chattutorial/chapter2-lists/CMakeLists.txt | 60 +---- .../chapter3-navigation/CMakeLists.txt | 60 +---- .../chattutorial/chapter4-models/CMakeLists.txt | 60 +---- .../chattutorial/chapter5-styling/CMakeLists.txt | 60 +---- .../imagine/automotive/CMakeLists.txt | 208 +++++++-------- .../imagine/musicplayer/CMakeLists.txt | 290 ++++++++++----------- 6 files changed, 297 insertions(+), 441 deletions(-) (limited to 'examples') diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt index 13db14c9..dfd86f61 100644 --- a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt @@ -46,55 +46,19 @@ qt6_add_resources(chapter2-lists "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../shared/Albert_Einstein.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein.png" -) -set_source_files_properties("../shared/Albert_Einstein@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@2x.png" -) -set_source_files_properties("../shared/Albert_Einstein@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@3x.png" -) -set_source_files_properties("../shared/Albert_Einstein@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@4x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@2x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@3x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@4x.png" -) -set_source_files_properties("../shared/Hans_Gude.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude.png" -) -set_source_files_properties("../shared/Hans_Gude@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@2x.png" -) -set_source_files_properties("../shared/Hans_Gude@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@3x.png" -) -set_source_files_properties("../shared/Hans_Gude@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@4x.png" -) set(shared_resource_files - "Albert_Einstein.png" - "Albert_Einstein@2x.png" - "Albert_Einstein@3x.png" - "Albert_Einstein@4x.png" - "Ernest_Hemingway.png" - "Ernest_Hemingway@2x.png" - "Ernest_Hemingway@3x.png" - "Ernest_Hemingway@4x.png" - "Hans_Gude.png" - "Hans_Gude@2x.png" - "Hans_Gude@3x.png" - "Hans_Gude@4x.png" + "../shared/Albert_Einstein.png" + "../shared/Albert_Einstein@2x.png" + "../shared/Albert_Einstein@3x.png" + "../shared/Albert_Einstein@4x.png" + "../shared/Ernest_Hemingway.png" + "../shared/Ernest_Hemingway@2x.png" + "../shared/Ernest_Hemingway@3x.png" + "../shared/Ernest_Hemingway@4x.png" + "../shared/Hans_Gude.png" + "../shared/Hans_Gude@2x.png" + "../shared/Hans_Gude@3x.png" + "../shared/Hans_Gude@4x.png" ) qt6_add_resources(chapter2-lists "shared" diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt index a75f26b7..400d568c 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt @@ -48,55 +48,19 @@ qt6_add_resources(chapter3-navigation "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../shared/Albert_Einstein.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein.png" -) -set_source_files_properties("../shared/Albert_Einstein@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@2x.png" -) -set_source_files_properties("../shared/Albert_Einstein@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@3x.png" -) -set_source_files_properties("../shared/Albert_Einstein@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@4x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@2x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@3x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@4x.png" -) -set_source_files_properties("../shared/Hans_Gude.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude.png" -) -set_source_files_properties("../shared/Hans_Gude@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@2x.png" -) -set_source_files_properties("../shared/Hans_Gude@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@3x.png" -) -set_source_files_properties("../shared/Hans_Gude@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@4x.png" -) set(shared_resource_files - "Albert_Einstein.png" - "Albert_Einstein@2x.png" - "Albert_Einstein@3x.png" - "Albert_Einstein@4x.png" - "Ernest_Hemingway.png" - "Ernest_Hemingway@2x.png" - "Ernest_Hemingway@3x.png" - "Ernest_Hemingway@4x.png" - "Hans_Gude.png" - "Hans_Gude@2x.png" - "Hans_Gude@3x.png" - "Hans_Gude@4x.png" + "../shared/Albert_Einstein.png" + "../shared/Albert_Einstein@2x.png" + "../shared/Albert_Einstein@3x.png" + "../shared/Albert_Einstein@4x.png" + "../shared/Ernest_Hemingway.png" + "../shared/Ernest_Hemingway@2x.png" + "../shared/Ernest_Hemingway@3x.png" + "../shared/Ernest_Hemingway@4x.png" + "../shared/Hans_Gude.png" + "../shared/Hans_Gude@2x.png" + "../shared/Hans_Gude@3x.png" + "../shared/Hans_Gude@4x.png" ) qt6_add_resources(chapter3-navigation "shared" diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt index 2cd7cd86..7ec1813b 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt @@ -52,55 +52,19 @@ qt6_add_resources(chapter4-models "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../shared/Albert_Einstein.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein.png" -) -set_source_files_properties("../shared/Albert_Einstein@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@2x.png" -) -set_source_files_properties("../shared/Albert_Einstein@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@3x.png" -) -set_source_files_properties("../shared/Albert_Einstein@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@4x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@2x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@3x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@4x.png" -) -set_source_files_properties("../shared/Hans_Gude.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude.png" -) -set_source_files_properties("../shared/Hans_Gude@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@2x.png" -) -set_source_files_properties("../shared/Hans_Gude@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@3x.png" -) -set_source_files_properties("../shared/Hans_Gude@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@4x.png" -) set(shared_resource_files - "Albert_Einstein.png" - "Albert_Einstein@2x.png" - "Albert_Einstein@3x.png" - "Albert_Einstein@4x.png" - "Ernest_Hemingway.png" - "Ernest_Hemingway@2x.png" - "Ernest_Hemingway@3x.png" - "Ernest_Hemingway@4x.png" - "Hans_Gude.png" - "Hans_Gude@2x.png" - "Hans_Gude@3x.png" - "Hans_Gude@4x.png" + "../shared/Albert_Einstein.png" + "../shared/Albert_Einstein@2x.png" + "../shared/Albert_Einstein@3x.png" + "../shared/Albert_Einstein@4x.png" + "../shared/Ernest_Hemingway.png" + "../shared/Ernest_Hemingway@2x.png" + "../shared/Ernest_Hemingway@3x.png" + "../shared/Ernest_Hemingway@4x.png" + "../shared/Hans_Gude.png" + "../shared/Hans_Gude@2x.png" + "../shared/Hans_Gude@3x.png" + "../shared/Hans_Gude@4x.png" ) qt6_add_resources(chapter4-models "shared" diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt index 9c03be4d..c48daafc 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt @@ -55,55 +55,19 @@ qt6_add_resources(chapter5-styling "qml" FILES ${qml_resource_files} ) -set_source_files_properties("../shared/Albert_Einstein.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein.png" -) -set_source_files_properties("../shared/Albert_Einstein@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@2x.png" -) -set_source_files_properties("../shared/Albert_Einstein@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@3x.png" -) -set_source_files_properties("../shared/Albert_Einstein@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Albert_Einstein@4x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@2x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@3x.png" -) -set_source_files_properties("../shared/Ernest_Hemingway@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Ernest_Hemingway@4x.png" -) -set_source_files_properties("../shared/Hans_Gude.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude.png" -) -set_source_files_properties("../shared/Hans_Gude@2x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@2x.png" -) -set_source_files_properties("../shared/Hans_Gude@3x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@3x.png" -) -set_source_files_properties("../shared/Hans_Gude@4x.png" - PROPERTIES QT_RESOURCE_ALIAS "Hans_Gude@4x.png" -) set(shared_resource_files - "Albert_Einstein.png" - "Albert_Einstein@2x.png" - "Albert_Einstein@3x.png" - "Albert_Einstein@4x.png" - "Ernest_Hemingway.png" - "Ernest_Hemingway@2x.png" - "Ernest_Hemingway@3x.png" - "Ernest_Hemingway@4x.png" - "Hans_Gude.png" - "Hans_Gude@2x.png" - "Hans_Gude@3x.png" - "Hans_Gude@4x.png" + "../shared/Albert_Einstein.png" + "../shared/Albert_Einstein@2x.png" + "../shared/Albert_Einstein@3x.png" + "../shared/Albert_Einstein@4x.png" + "../shared/Ernest_Hemingway.png" + "../shared/Ernest_Hemingway@2x.png" + "../shared/Ernest_Hemingway@3x.png" + "../shared/Ernest_Hemingway@4x.png" + "../shared/Hans_Gude.png" + "../shared/Hans_Gude@2x.png" + "../shared/Hans_Gude@3x.png" + "../shared/Hans_Gude@4x.png" ) qt6_add_resources(chapter5-styling "shared" diff --git a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt index ad417e51..978973be 100644 --- a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt +++ b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt @@ -37,31 +37,31 @@ target_link_libraries(automotive PUBLIC # Resources: set(icons_resource_files - "automotive/44x44/air-con.png" - "automotive/44x44/command.png" - "automotive/44x44/message.png" - "automotive/44x44/music.png" - "automotive/44x44/seats.png" - "automotive/44x44/settings.png" - "automotive/44x44/statistics.png" - "automotive/44x44/windows.png" - "automotive/44x44@2/air-con.png" - "automotive/44x44@2/command.png" - "automotive/44x44@2/message.png" - "automotive/44x44@2/music.png" - "automotive/44x44@2/navigation.png" - "automotive/44x44@2/seats.png" - "automotive/44x44@2/settings.png" - "automotive/44x44@2/statistics.png" - "automotive/44x44@2/windows.png" - "automotive/icons.svg" - "automotive/index.theme" - "car.png" - "car@2x.png" - "warning.png" - "warning@2x.png" - "weather.png" - "weather@2x.png" + "icons/automotive/44x44/air-con.png" + "icons/automotive/44x44/command.png" + "icons/automotive/44x44/message.png" + "icons/automotive/44x44/music.png" + "icons/automotive/44x44/seats.png" + "icons/automotive/44x44/settings.png" + "icons/automotive/44x44/statistics.png" + "icons/automotive/44x44/windows.png" + "icons/automotive/44x44@2/air-con.png" + "icons/automotive/44x44@2/command.png" + "icons/automotive/44x44@2/message.png" + "icons/automotive/44x44@2/music.png" + "icons/automotive/44x44@2/navigation.png" + "icons/automotive/44x44@2/seats.png" + "icons/automotive/44x44@2/settings.png" + "icons/automotive/44x44@2/statistics.png" + "icons/automotive/44x44@2/windows.png" + "icons/automotive/icons.svg" + "icons/automotive/index.theme" + "icons/car.png" + "icons/car@2x.png" + "icons/warning.png" + "icons/warning@2x.png" + "icons/weather.png" + "icons/weather@2x.png" ) qt6_add_resources(automotive "icons" @@ -73,82 +73,82 @@ qt6_add_resources(automotive "icons" ${icons_resource_files} ) set(imagine-assets_resource_files - "applicationwindow-background.png" - "applicationwindow-background@2x.png" - "button-background-checked-hovered.9.png" - "button-background-checked-hovered@2x.9.png" - "button-background-checked.9.png" - "button-background-checked@2x.9.png" - "button-background-hovered.9.png" - "button-background-hovered@2x.9.png" - "button-background-pressed.9.png" - "button-background-pressed@2x.9.png" - "button-background.9.png" - "button-background@2x.9.png" - "dial-background-hovered.png" - "dial-background-hovered@2x.png" - "dial-background-pressed.png" - "dial-background-pressed@2x.png" - "dial-background.png" - "dial-background@2x.png" - "dial-handle-pressed.png" - "dial-handle-pressed@2x.png" - "dial-handle.png" - "dial-handle@2x.png" - "frame-background.9.png" - "frame-background@2x.9.png" - "itemdelegate-background-checked.9.png" - "itemdelegate-background-checked@2x.9.png" - "itemdelegate-background-hovered.9.png" - "itemdelegate-background-hovered@2x.9.png" - "itemdelegate-background-pressed.9.png" - "itemdelegate-background-pressed@2x.9.png" - "itemdelegate-background.9.png" - "itemdelegate-background@2x.9.png" - "radiobutton-indicator-checked-hovered.png" - "radiobutton-indicator-checked-hovered@2x.png" - "radiobutton-indicator-checked-pressed.png" - "radiobutton-indicator-checked-pressed@2x.png" - "radiobutton-indicator-checked.png" - "radiobutton-indicator-checked@2x.png" - "radiobutton-indicator-hovered.png" - "radiobutton-indicator-hovered@2x.png" - "radiobutton-indicator-pressed.png" - "radiobutton-indicator-pressed@2x.png" - "radiobutton-indicator.png" - "radiobutton-indicator@2x.png" - "scrollindicator-handle.png" - "scrollindicator-handle@2x.png" - "slider-background-horizontal.9.png" - "slider-background-horizontal@2x.9.png" - "slider-handle-hovered.png" - "slider-handle-hovered@2x.png" - "slider-handle-pressed.png" - "slider-handle-pressed@2x.png" - "slider-handle.png" - "slider-handle@2x.png" - "slider-progress-horizontal-pressed.9.png" - "slider-progress-horizontal-pressed@2x.9.png" - "slider-progress-horizontal.9.png" - "slider-progress-horizontal@2x.9.png" - "switchdelegate-background.9.png" - "switchdelegate-background@2x.9.png" - "switchdelegate-handle-checked-hovered.png" - "switchdelegate-handle-checked-hovered@2x.png" - "switchdelegate-handle-checked.png" - "switchdelegate-handle-checked@2x.png" - "switchdelegate-handle-hovered.png" - "switchdelegate-handle-hovered@2x.png" - "switchdelegate-handle-pressed.png" - "switchdelegate-handle-pressed@2x.png" - "switchdelegate-handle.png" - "switchdelegate-handle@2x.png" - "switchdelegate-indicator-pressed.png" - "switchdelegate-indicator-pressed@2x.png" - "switchdelegate-indicator.png" - "switchdelegate-indicator@2x.png" - "toolseparator-separator-vertical.9.png" - "toolseparator-separator-vertical@2x.9.png" + "imagine-assets/applicationwindow-background.png" + "imagine-assets/applicationwindow-background@2x.png" + "imagine-assets/button-background-checked-hovered.9.png" + "imagine-assets/button-background-checked-hovered@2x.9.png" + "imagine-assets/button-background-checked.9.png" + "imagine-assets/button-background-checked@2x.9.png" + "imagine-assets/button-background-hovered.9.png" + "imagine-assets/button-background-hovered@2x.9.png" + "imagine-assets/button-background-pressed.9.png" + "imagine-assets/button-background-pressed@2x.9.png" + "imagine-assets/button-background.9.png" + "imagine-assets/button-background@2x.9.png" + "imagine-assets/dial-background-hovered.png" + "imagine-assets/dial-background-hovered@2x.png" + "imagine-assets/dial-background-pressed.png" + "imagine-assets/dial-background-pressed@2x.png" + "imagine-assets/dial-background.png" + "imagine-assets/dial-background@2x.png" + "imagine-assets/dial-handle-pressed.png" + "imagine-assets/dial-handle-pressed@2x.png" + "imagine-assets/dial-handle.png" + "imagine-assets/dial-handle@2x.png" + "imagine-assets/frame-background.9.png" + "imagine-assets/frame-background@2x.9.png" + "imagine-assets/itemdelegate-background-checked.9.png" + "imagine-assets/itemdelegate-background-checked@2x.9.png" + "imagine-assets/itemdelegate-background-hovered.9.png" + "imagine-assets/itemdelegate-background-hovered@2x.9.png" + "imagine-assets/itemdelegate-background-pressed.9.png" + "imagine-assets/itemdelegate-background-pressed@2x.9.png" + "imagine-assets/itemdelegate-background.9.png" + "imagine-assets/itemdelegate-background@2x.9.png" + "imagine-assets/radiobutton-indicator-checked-hovered.png" + "imagine-assets/radiobutton-indicator-checked-hovered@2x.png" + "imagine-assets/radiobutton-indicator-checked-pressed.png" + "imagine-assets/radiobutton-indicator-checked-pressed@2x.png" + "imagine-assets/radiobutton-indicator-checked.png" + "imagine-assets/radiobutton-indicator-checked@2x.png" + "imagine-assets/radiobutton-indicator-hovered.png" + "imagine-assets/radiobutton-indicator-hovered@2x.png" + "imagine-assets/radiobutton-indicator-pressed.png" + "imagine-assets/radiobutton-indicator-pressed@2x.png" + "imagine-assets/radiobutton-indicator.png" + "imagine-assets/radiobutton-indicator@2x.png" + "imagine-assets/scrollindicator-handle.png" + "imagine-assets/scrollindicator-handle@2x.png" + "imagine-assets/slider-background-horizontal.9.png" + "imagine-assets/slider-background-horizontal@2x.9.png" + "imagine-assets/slider-handle-hovered.png" + "imagine-assets/slider-handle-hovered@2x.png" + "imagine-assets/slider-handle-pressed.png" + "imagine-assets/slider-handle-pressed@2x.png" + "imagine-assets/slider-handle.png" + "imagine-assets/slider-handle@2x.png" + "imagine-assets/slider-progress-horizontal-pressed.9.png" + "imagine-assets/slider-progress-horizontal-pressed@2x.9.png" + "imagine-assets/slider-progress-horizontal.9.png" + "imagine-assets/slider-progress-horizontal@2x.9.png" + "imagine-assets/switchdelegate-background.9.png" + "imagine-assets/switchdelegate-background@2x.9.png" + "imagine-assets/switchdelegate-handle-checked-hovered.png" + "imagine-assets/switchdelegate-handle-checked-hovered@2x.png" + "imagine-assets/switchdelegate-handle-checked.png" + "imagine-assets/switchdelegate-handle-checked@2x.png" + "imagine-assets/switchdelegate-handle-hovered.png" + "imagine-assets/switchdelegate-handle-hovered@2x.png" + "imagine-assets/switchdelegate-handle-pressed.png" + "imagine-assets/switchdelegate-handle-pressed@2x.png" + "imagine-assets/switchdelegate-handle.png" + "imagine-assets/switchdelegate-handle@2x.png" + "imagine-assets/switchdelegate-indicator-pressed.png" + "imagine-assets/switchdelegate-indicator-pressed@2x.png" + "imagine-assets/switchdelegate-indicator.png" + "imagine-assets/switchdelegate-indicator@2x.png" + "imagine-assets/toolseparator-separator-vertical.9.png" + "imagine-assets/toolseparator-separator-vertical@2x.9.png" ) qt6_add_resources(automotive "imagine-assets" @@ -160,9 +160,9 @@ qt6_add_resources(automotive "imagine-assets" ${imagine-assets_resource_files} ) set(qml_resource_files - "FeatureButton.qml" - "LargeLabel.qml" - "automotive.qml" + "qml/FeatureButton.qml" + "qml/LargeLabel.qml" + "qml/automotive.qml" ) qt6_add_resources(automotive "qml" diff --git a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt index acb08164..774a9197 100644 --- a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt +++ b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt @@ -37,42 +37,42 @@ target_link_libraries(musicplayer PUBLIC # Resources: set(icons_resource_files - "musicplayer/32x32/bluetooth.png" - "musicplayer/32x32/cart.png" - "musicplayer/32x32/cloud.png" - "musicplayer/32x32/favorite.png" - "musicplayer/32x32/filter.png" - "musicplayer/32x32/folder.png" - "musicplayer/32x32/message.png" - "musicplayer/32x32/music.png" - "musicplayer/32x32/next.png" - "musicplayer/32x32/pause.png" - "musicplayer/32x32/power.png" - "musicplayer/32x32/previous.png" - "musicplayer/32x32/repeat.png" - "musicplayer/32x32/save.png" - "musicplayer/32x32/settings.png" - "musicplayer/32x32/shuffle.png" - "musicplayer/32x32/stop.png" - "musicplayer/32x32@2/bluetooth.png" - "musicplayer/32x32@2/cart.png" - "musicplayer/32x32@2/cloud.png" - "musicplayer/32x32@2/favorite.png" - "musicplayer/32x32@2/filter.png" - "musicplayer/32x32@2/folder.png" - "musicplayer/32x32@2/grid.png" - "musicplayer/32x32@2/message.png" - "musicplayer/32x32@2/music.png" - "musicplayer/32x32@2/next.png" - "musicplayer/32x32@2/pause.png" - "musicplayer/32x32@2/power.png" - "musicplayer/32x32@2/previous.png" - "musicplayer/32x32@2/repeat.png" - "musicplayer/32x32@2/save.png" - "musicplayer/32x32@2/settings.png" - "musicplayer/32x32@2/shuffle.png" - "musicplayer/32x32@2/stop.png" - "musicplayer/index.theme" + "icons/musicplayer/32x32/bluetooth.png" + "icons/musicplayer/32x32/cart.png" + "icons/musicplayer/32x32/cloud.png" + "icons/musicplayer/32x32/favorite.png" + "icons/musicplayer/32x32/filter.png" + "icons/musicplayer/32x32/folder.png" + "icons/musicplayer/32x32/message.png" + "icons/musicplayer/32x32/music.png" + "icons/musicplayer/32x32/next.png" + "icons/musicplayer/32x32/pause.png" + "icons/musicplayer/32x32/power.png" + "icons/musicplayer/32x32/previous.png" + "icons/musicplayer/32x32/repeat.png" + "icons/musicplayer/32x32/save.png" + "icons/musicplayer/32x32/settings.png" + "icons/musicplayer/32x32/shuffle.png" + "icons/musicplayer/32x32/stop.png" + "icons/musicplayer/32x32@2/bluetooth.png" + "icons/musicplayer/32x32@2/cart.png" + "icons/musicplayer/32x32@2/cloud.png" + "icons/musicplayer/32x32@2/favorite.png" + "icons/musicplayer/32x32@2/filter.png" + "icons/musicplayer/32x32@2/folder.png" + "icons/musicplayer/32x32@2/grid.png" + "icons/musicplayer/32x32@2/message.png" + "icons/musicplayer/32x32@2/music.png" + "icons/musicplayer/32x32@2/next.png" + "icons/musicplayer/32x32@2/pause.png" + "icons/musicplayer/32x32@2/power.png" + "icons/musicplayer/32x32@2/previous.png" + "icons/musicplayer/32x32@2/repeat.png" + "icons/musicplayer/32x32@2/save.png" + "icons/musicplayer/32x32@2/settings.png" + "icons/musicplayer/32x32@2/shuffle.png" + "icons/musicplayer/32x32@2/stop.png" + "icons/musicplayer/index.theme" ) qt6_add_resources(musicplayer "icons" @@ -84,115 +84,115 @@ qt6_add_resources(musicplayer "icons" ${icons_resource_files} ) set(imagine-assets_resource_files - "applicationwindow-background.png" - "button-background-checked-hovered.9.png" - "button-background-checked-hovered@2x.9.png" - "button-background-checked.9.png" - "button-background-checked@2x.9.png" - "button-background-disabled.9.png" - "button-background-disabled@2x.9.png" - "button-background-hovered.9.png" - "button-background-hovered@2x.9.png" - "button-background-pressed.9.png" - "button-background-pressed@2x.9.png" - "button-background.9.png" - "button-background@2x.9.png" - "combobox-background-hovered.9.png" - "combobox-background-hovered@2x.9.png" - "combobox-background-open.9.png" - "combobox-background-open@2x.9.png" - "combobox-background-pressed.9.png" - "combobox-background-pressed@2x.9.png" - "combobox-background.9.png" - "combobox-background@2x.9.png" - "combobox-indicator-hovered.png" - "combobox-indicator-hovered@2x.png" - "combobox-indicator-open.png" - "combobox-indicator-open@2x.png" - "combobox-indicator-pressed.png" - "combobox-indicator-pressed@2x.png" - "combobox-indicator.png" - "combobox-indicator@2x.png" - "combobox-popup.9.png" - "combobox-popup@2x.9.png" - "dial-background-hovered.png" - "dial-background-hovered@2x.png" - "dial-background-pressed.png" - "dial-background-pressed@2x.png" - "dial-background.png" - "dial-background@2x.png" - "dial-handle-pressed.png" - "dial-handle-pressed@2x.png" - "dial-handle.png" - "dial-handle@2x.png" - "frame-background.9.png" - "frame-background@2x.9.png" - "itemdelegate-background-checked.9.png" - "itemdelegate-background-checked@2x.9.png" - "itemdelegate-background-disabled.9.png" - "itemdelegate-background-disabled@2x.9.png" - "itemdelegate-background-hovered.9.png" - "itemdelegate-background-hovered@2x.9.png" - "itemdelegate-background-pressed.9.png" - "itemdelegate-background-pressed@2x.9.png" - "itemdelegate-background.9.png" - "itemdelegate-background@2x.9.png" - "roundbutton-background-checked-hovered.png" - "roundbutton-background-checked-hovered@2x.png" - "roundbutton-background-checked.png" - "roundbutton-background-checked@2x.png" - "roundbutton-background-disabled.png" - "roundbutton-background-disabled@2x.png" - "roundbutton-background-hovered.png" - "roundbutton-background-hovered@2x.png" - "roundbutton-background-pressed.png" - "roundbutton-background-pressed@2x.png" - "roundbutton-background.png" - "roundbutton-background@2x.png" - "scrollbar-handle-interactive-hovered.png" - "scrollbar-handle-interactive-hovered@2x.png" - "scrollbar-handle-interactive-pressed.png" - "scrollbar-handle-interactive-pressed@2x.png" - "scrollbar-handle-interactive.png" - "scrollbar-handle-interactive@2x.png" - "slider-background-horizontal-disabled.9.png" - "slider-background-horizontal-disabled@2x.9.png" - "slider-background-horizontal.9.png" - "slider-background-horizontal@2x.9.png" - "slider-background-vertical-disabled.9.png" - "slider-background-vertical-disabled@2x.9.png" - "slider-background-vertical.9.png" - "slider-background-vertical@2x.9.png" - "slider-handle-disabled.png" - "slider-handle-disabled@2x.png" - "slider-handle-hovered.png" - "slider-handle-hovered@2x.png" - "slider-handle.png" - "slider-handle@2x.png" - "slider-progress-horizontal.9.png" - "slider-progress-horizontal@2x.9.png" - "slider-progress-vertical-disabled.9.png" - "slider-progress-vertical-disabled@2x.9.png" - "slider-progress-vertical.9.png" - "slider-progress-vertical@2x.9.png" - "textfield-background-disabled.9.png" - "textfield-background-disabled@2x.9.png" - "textfield-background.9.png" - "textfield-background@2x.9.png" - "toolbar-background.9.png" - "toolbar-background@2x.9.png" - "toolbutton-background-checked-hovered.9.png" - "toolbutton-background-checked-hovered@2x.9.png" - "toolbutton-background-checked.9.png" - "toolbutton-background-checked@2x.9.png" - "toolbutton-background-hovered.9.png" - "toolbutton-background-hovered@2x.9.png" - "toolbutton-background-pressed.9.png" - "toolbutton-background-pressed@2x.9.png" - "toolbutton-background.9.png" - "toolbutton-background@2x.9.png" - "tooltip-background.9.png" - "tooltip-background@2x.9.png" + "imagine-assets/applicationwindow-background.png" + "imagine-assets/button-background-checked-hovered.9.png" + "imagine-assets/button-background-checked-hovered@2x.9.png" + "imagine-assets/button-background-checked.9.png" + "imagine-assets/button-background-checked@2x.9.png" + "imagine-assets/button-background-disabled.9.png" + "imagine-assets/button-background-disabled@2x.9.png" + "imagine-assets/button-background-hovered.9.png" + "imagine-assets/button-background-hovered@2x.9.png" + "imagine-assets/button-background-pressed.9.png" + "imagine-assets/button-background-pressed@2x.9.png" + "imagine-assets/button-background.9.png" + "imagine-assets/button-background@2x.9.png" + "imagine-assets/combobox-background-hovered.9.png" + "imagine-assets/combobox-background-hovered@2x.9.png" + "imagine-assets/combobox-background-open.9.png" + "imagine-assets/combobox-background-open@2x.9.png" + "imagine-assets/combobox-background-pressed.9.png" + "imagine-assets/combobox-background-pressed@2x.9.png" + "imagine-assets/combobox-background.9.png" + "imagine-assets/combobox-background@2x.9.png" + "imagine-assets/combobox-indicator-hovered.png" + "imagine-assets/combobox-indicator-hovered@2x.png" + "imagine-assets/combobox-indicator-open.png" + "imagine-assets/combobox-indicator-open@2x.png" + "imagine-assets/combobox-indicator-pressed.png" + "imagine-assets/combobox-indicator-pressed@2x.png" + "imagine-assets/combobox-indicator.png" + "imagine-assets/combobox-indicator@2x.png" + "imagine-assets/combobox-popup.9.png" + "imagine-assets/combobox-popup@2x.9.png" + "imagine-assets/dial-background-hovered.png" + "imagine-assets/dial-background-hovered@2x.png" + "imagine-assets/dial-background-pressed.png" + "imagine-assets/dial-background-pressed@2x.png" + "imagine-assets/dial-background.png" + "imagine-assets/dial-background@2x.png" + "imagine-assets/dial-handle-pressed.png" + "imagine-assets/dial-handle-pressed@2x.png" + "imagine-assets/dial-handle.png" + "imagine-assets/dial-handle@2x.png" + "imagine-assets/frame-background.9.png" + "imagine-assets/frame-background@2x.9.png" + "imagine-assets/itemdelegate-background-checked.9.png" + "imagine-assets/itemdelegate-background-checked@2x.9.png" + "imagine-assets/itemdelegate-background-disabled.9.png" + "imagine-assets/itemdelegate-background-disabled@2x.9.png" + "imagine-assets/itemdelegate-background-hovered.9.png" + "imagine-assets/itemdelegate-background-hovered@2x.9.png" + "imagine-assets/itemdelegate-background-pressed.9.png" + "imagine-assets/itemdelegate-background-pressed@2x.9.png" + "imagine-assets/itemdelegate-background.9.png" + "imagine-assets/itemdelegate-background@2x.9.png" + "imagine-assets/roundbutton-background-checked-hovered.png" + "imagine-assets/roundbutton-background-checked-hovered@2x.png" + "imagine-assets/roundbutton-background-checked.png" + "imagine-assets/roundbutton-background-checked@2x.png" + "imagine-assets/roundbutton-background-disabled.png" + "imagine-assets/roundbutton-background-disabled@2x.png" + "imagine-assets/roundbutton-background-hovered.png" + "imagine-assets/roundbutton-background-hovered@2x.png" + "imagine-assets/roundbutton-background-pressed.png" + "imagine-assets/roundbutton-background-pressed@2x.png" + "imagine-assets/roundbutton-background.png" + "imagine-assets/roundbutton-background@2x.png" + "imagine-assets/scrollbar-handle-interactive-hovered.png" + "imagine-assets/scrollbar-handle-interactive-hovered@2x.png" + "imagine-assets/scrollbar-handle-interactive-pressed.png" + "imagine-assets/scrollbar-handle-interactive-pressed@2x.png" + "imagine-assets/scrollbar-handle-interactive.png" + "imagine-assets/scrollbar-handle-interactive@2x.png" + "imagine-assets/slider-background-horizontal-disabled.9.png" + "imagine-assets/slider-background-horizontal-disabled@2x.9.png" + "imagine-assets/slider-background-horizontal.9.png" + "imagine-assets/slider-background-horizontal@2x.9.png" + "imagine-assets/slider-background-vertical-disabled.9.png" + "imagine-assets/slider-background-vertical-disabled@2x.9.png" + "imagine-assets/slider-background-vertical.9.png" + "imagine-assets/slider-background-vertical@2x.9.png" + "imagine-assets/slider-handle-disabled.png" + "imagine-assets/slider-handle-disabled@2x.png" + "imagine-assets/slider-handle-hovered.png" + "imagine-assets/slider-handle-hovered@2x.png" + "imagine-assets/slider-handle.png" + "imagine-assets/slider-handle@2x.png" + "imagine-assets/slider-progress-horizontal.9.png" + "imagine-assets/slider-progress-horizontal@2x.9.png" + "imagine-assets/slider-progress-vertical-disabled.9.png" + "imagine-assets/slider-progress-vertical-disabled@2x.9.png" + "imagine-assets/slider-progress-vertical.9.png" + "imagine-assets/slider-progress-vertical@2x.9.png" + "imagine-assets/textfield-background-disabled.9.png" + "imagine-assets/textfield-background-disabled@2x.9.png" + "imagine-assets/textfield-background.9.png" + "imagine-assets/textfield-background@2x.9.png" + "imagine-assets/toolbar-background.9.png" + "imagine-assets/toolbar-background@2x.9.png" + "imagine-assets/toolbutton-background-checked-hovered.9.png" + "imagine-assets/toolbutton-background-checked-hovered@2x.9.png" + "imagine-assets/toolbutton-background-checked.9.png" + "imagine-assets/toolbutton-background-checked@2x.9.png" + "imagine-assets/toolbutton-background-hovered.9.png" + "imagine-assets/toolbutton-background-hovered@2x.9.png" + "imagine-assets/toolbutton-background-pressed.9.png" + "imagine-assets/toolbutton-background-pressed@2x.9.png" + "imagine-assets/toolbutton-background.9.png" + "imagine-assets/toolbutton-background@2x.9.png" + "imagine-assets/tooltip-background.9.png" + "imagine-assets/tooltip-background@2x.9.png" ) qt6_add_resources(musicplayer "imagine-assets" -- cgit v1.2.3