diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-02 16:44:55 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-21 19:45:44 +0100 |
| commit | 8f7080fd0957fea3a67a255e5344ab125fa3c33f (patch) | |
| tree | 4569ad2e2e1089212de2090c71ba4a52ef2e9522 /examples/quick/tutorials | |
| parent | ba092a525d01ee028bea6da271ea4baf64a62095 (diff) | |
Replace AUTO_RESOURCE_PREFIX with Qt CMake Policy in examples, tests
Every instance of AUTO_RESOURCE_PREFIX has been replaced by either
qt_standard_project_setup(REQUIRES 6.5) or with
qt_policy(SET QTP0001 NEW), mainly in tests.
In addition, I added a warning message for the case where
AUTO_RESOURCE_PREFIX is used.
Pick-to: 6.5
Task-number: QTBUG-96233
Change-Id: I323a15e9d0bb5fe6ba649365314af9fc2ad67bda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'examples/quick/tutorials')
8 files changed, 16 insertions, 8 deletions
diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt index 4cc0d60742..e99a4a18e9 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynam find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview1 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(dynamicview1 PROPERTIES qt_add_qml_module(dynamicview1 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt index 6db9439a77..37d6adb8f1 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynam find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview2 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(dynamicview2 PROPERTIES qt_add_qml_module(dynamicview2 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt index 6b7a4b1605..1257110860 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynam find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview3 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(dynamicview3 PROPERTIES qt_add_qml_module(dynamicview3 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml PetsModel.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt index aff35996da..a1c4705c65 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/dynamicview/dynam find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicview4 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(dynamicview4 PROPERTIES qt_add_qml_module(dynamicview4 URI dynamicview - AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml ListSelector.qml diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt index 8cc399ccd0..7886f4573d 100644 --- a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame1 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(samegame1 PROPERTIES qt_add_qml_module(samegame1 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt index 1233e4d407..29c8d74bf4 100644 --- a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame2 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(samegame2 PROPERTIES qt_add_qml_module(samegame2 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt index 59fa1302a6..def9f5f8a3 100644 --- a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame3 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(samegame3 PROPERTIES qt_add_qml_module(samegame3 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" "Button.qml" diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt index 77fdb83718..0ed15f4e2a 100644 --- a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(samegame4 main.cpp ) @@ -25,7 +27,6 @@ set_target_properties(samegame4 PROPERTIES qt_add_qml_module(samegame4 URI samegame - AUTO_RESOURCE_PREFIX QML_FILES "BoomBlock.qml" "Button.qml" |