diff options
| author | Amir Masoud Abdol <[email protected]> | 2023-02-02 16:44:55 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <[email protected]> | 2023-02-21 19:45:44 +0100 |
| commit | 8f7080fd0957fea3a67a255e5344ab125fa3c33f (patch) | |
| tree | 4569ad2e2e1089212de2090c71ba4a52ef2e9522 /examples/quick/customitems | |
| 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 <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Oliver Eftevaag <[email protected]>
Diffstat (limited to 'examples/quick/customitems')
4 files changed, 6 insertions, 4 deletions
diff --git a/examples/quick/customitems/dialcontrol/CMakeLists.txt b/examples/quick/customitems/dialcontrol/CMakeLists.txt index e714908c52..f07816206c 100644 --- a/examples/quick/customitems/dialcontrol/CMakeLists.txt +++ b/examples/quick/customitems/dialcontrol/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/customitems/dialcontrol") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dialcontrolexample main.cpp ) @@ -32,7 +34,6 @@ target_link_libraries(dialcontrolexample PUBLIC qt_add_qml_module(dialcontrolexample URI dialcontrol - AUTO_RESOURCE_PREFIX QML_FILES "Dial.qml" "QuitButton.qml" diff --git a/examples/quick/customitems/flipable/CMakeLists.txt b/examples/quick/customitems/flipable/CMakeLists.txt index 1e9bec27c5..8c51b7b457 100644 --- a/examples/quick/customitems/flipable/CMakeLists.txt +++ b/examples/quick/customitems/flipable/CMakeLists.txt @@ -15,6 +15,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/customitems/flipable") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(flipableexample WIN32 MACOSX_BUNDLE @@ -30,7 +32,6 @@ target_link_libraries(flipableexample PUBLIC qt_add_qml_module(flipableexample URI flipable - AUTO_RESOURCE_PREFIX QML_FILES "flipable.qml" "Card.qml" diff --git a/examples/quick/customitems/painteditem/CMakeLists.txt b/examples/quick/customitems/painteditem/CMakeLists.txt index 9f2d54bf8d..49c1e4f0d0 100644 --- a/examples/quick/customitems/painteditem/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/CMakeLists.txt @@ -15,13 +15,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/customitems/painteditem") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + add_subdirectory(TextBalloon) qt_add_executable(painteditemexample WIN32 MACOSX_BUNDLE main.cpp) qt_add_qml_module(painteditemexample URI painteditem - AUTO_RESOURCE_PREFIX QML_FILES "textballoons.qml" ) diff --git a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt index 950e8ee616..472d049ffb 100644 --- a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt @@ -10,7 +10,6 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/customitems/painteditem/Tex qt_add_qml_module(qmltextballoon URI "TextBalloon" PLUGIN_TARGET qmltextballoon - AUTO_RESOURCE_PREFIX SOURCES textballoon.cpp textballoon.h ) |