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 +++++----------------- 4 files changed, 48 insertions(+), 192 deletions(-) (limited to 'examples/quickcontrols2/chattutorial') 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" -- cgit v1.2.3