From db81d9f54957af05b0e8ad7fd553cf8287f5a9e5 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 2 Feb 2023 16:44:55 +0100 Subject: [PATCH] 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. Task-number: QTBUG-96233 Change-Id: I323a15e9d0bb5fe6ba649365314af9fc2ad67bda Reviewed-by: Alexandru Croitor Reviewed-by: Fabian Kosmale Reviewed-by: Oliver Eftevaag (cherry picked from commit 8f7080fd0957fea3a67a255e5344ab125fa3c33f) --- examples/qml/dynamicscene/CMakeLists.txt | 3 ++- examples/qml/qmlextensionplugins/CMakeLists.txt | 3 ++- examples/qml/xmlhttprequest/CMakeLists.txt | 3 ++- examples/quick/animation/CMakeLists.txt | 3 +-- examples/quick/canvas/CMakeLists.txt | 3 +-- examples/quick/customitems/dialcontrol/CMakeLists.txt | 3 ++- examples/quick/customitems/flipable/CMakeLists.txt | 3 ++- examples/quick/customitems/painteditem/CMakeLists.txt | 3 ++- .../quick/customitems/painteditem/TextBalloon/CMakeLists.txt | 1 - examples/quick/delegatechooser/CMakeLists.txt | 3 +-- examples/quick/draganddrop/CMakeLists.txt | 3 +-- examples/quick/embeddedinwidgets/CMakeLists.txt | 3 +-- examples/quick/externaldraganddrop/CMakeLists.txt | 3 +-- examples/quick/imageelements/CMakeLists.txt | 3 +-- examples/quick/imageprovider/CMakeLists.txt | 3 ++- examples/quick/imageresponseprovider/CMakeLists.txt | 3 ++- examples/quick/itemvariablerefreshrate/CMakeLists.txt | 3 +-- examples/quick/keyinteraction/CMakeLists.txt | 3 +-- examples/quick/layouts/CMakeLists.txt | 3 +-- examples/quick/localstorage/CMakeLists.txt | 3 +-- examples/quick/models/abstractitemmodel/CMakeLists.txt | 3 +-- examples/quick/models/objectlistmodel/CMakeLists.txt | 3 +-- examples/quick/models/stringlistmodel/CMakeLists.txt | 3 +-- examples/quick/mousearea/CMakeLists.txt | 3 +-- examples/quick/multieffect/itemswitcher/CMakeLists.txt | 3 +-- examples/quick/multieffect/testbed/CMakeLists.txt | 3 +-- examples/quick/particles/affectors/CMakeLists.txt | 3 +-- examples/quick/particles/emitters/CMakeLists.txt | 3 +-- examples/quick/particles/imageparticle/CMakeLists.txt | 3 +-- examples/quick/particles/itemparticle/CMakeLists.txt | 3 +-- examples/quick/particles/system/CMakeLists.txt | 3 +-- examples/quick/pointerhandlers/CMakeLists.txt | 3 +-- examples/quick/positioners/CMakeLists.txt | 3 +-- examples/quick/quick-accessibility/CMakeLists.txt | 3 +-- .../quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt | 3 ++- .../quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt | 3 +-- examples/quick/righttoleft/CMakeLists.txt | 3 +-- examples/quick/shadereffects/CMakeLists.txt | 3 +-- examples/quick/shapes/CMakeLists.txt | 3 +-- examples/quick/shared/CMakeLists.txt | 1 - examples/quick/text/CMakeLists.txt | 3 +-- examples/quick/threading/CMakeLists.txt | 3 +-- examples/quick/touchinteraction/CMakeLists.txt | 3 +-- .../quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt | 3 ++- .../quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt | 3 ++- .../quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt | 3 ++- .../quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt | 3 ++- examples/quick/tutorials/samegame/samegame1/CMakeLists.txt | 3 ++- examples/quick/tutorials/samegame/samegame2/CMakeLists.txt | 3 ++- examples/quick/tutorials/samegame/samegame3/CMakeLists.txt | 3 ++- examples/quick/tutorials/samegame/samegame4/CMakeLists.txt | 3 ++- examples/quick/views/CMakeLists.txt | 3 ++- examples/quick/window/CMakeLists.txt | 3 +-- .../quickcontrols/attachedstyleproperties/CMakeLists.txt | 3 ++- src/qml/Qt6QmlMacros.cmake | 5 +++++ tests/auto/qml/debugger/qv4debugger/CMakeLists.txt | 3 ++- tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt | 3 ++- tests/auto/qml/qmlsplitlib/CMakeLists.txt | 3 ++- tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt | 3 ++- tests/auto/qml/qmltc_manual/CMakeLists.txt | 3 ++- tests/auto/qml/qmltc_qprocess/CMakeLists.txt | 3 ++- tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 4 +++- .../qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt | 4 +++- tests/auto/qml/qqmlcomponent/CMakeLists.txt | 3 ++- tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt | 3 ++- tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt | 3 ++- tests/auto/quick/qquicklistview2/CMakeLists.txt | 3 ++- 67 files changed, 102 insertions(+), 99 deletions(-) diff --git a/examples/qml/dynamicscene/CMakeLists.txt b/examples/qml/dynamicscene/CMakeLists.txt index b91ed5aca7..2999324307 100644 --- a/examples/qml/dynamicscene/CMakeLists.txt +++ b/examples/qml/dynamicscene/CMakeLists.txt @@ -15,6 +15,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qml/dynamicscene") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(dynamicsceneexample WIN32 MACOSX_BUNDLE main.cpp) target_link_libraries(dynamicsceneexample PUBLIC @@ -26,7 +28,6 @@ target_link_libraries(dynamicsceneexample PUBLIC qt_add_qml_module(dynamicsceneexample URI dynamicscene - AUTO_RESOURCE_PREFIX QML_FILES "GenericSceneItem.qml" "PaletteItem.qml" diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt index 753f05b173..0a16d6c843 100644 --- a/examples/qml/qmlextensionplugins/CMakeLists.txt +++ b/examples/qml/qmlextensionplugins/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qml/qmlextensionplugins/imports/T find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml) +qt_standard_project_setup(REQUIRES 6.5) + #![0] set(qml_files imports/TimeExample/Clock.qml @@ -37,7 +39,6 @@ qt_add_qml_module(qmlqtimeexample OUTPUT_DIRECTORY imports/TimeExample URI "TimeExample" SOURCES timemodel.cpp timemodel.h - AUTO_RESOURCE_PREFIX QML_FILES ${qml_files} RESOURCES ${images} ) diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt index 63d15c37dd..8c36cf54d4 100644 --- a/examples/qml/xmlhttprequest/CMakeLists.txt +++ b/examples/qml/xmlhttprequest/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qml/xmlhttprequest") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(xmlhttprequestexample WIN32 MACOSX_BUNDLE @@ -22,7 +24,6 @@ qt_add_executable(xmlhttprequestexample qt_add_qml_module(xmlhttprequestexample URI xmlhttprequest - AUTO_RESOURCE_PREFIX QML_FILES "methods.js" "xmlhttprequest.qml" diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt index 1c9d954c42..aa7f0de6d9 100644 --- a/examples/quick/animation/CMakeLists.txt +++ b/examples/quick/animation/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/animation") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(animationexample animation_shared) qt_add_qml_module(animationexample URI animation - AUTO_RESOURCE_PREFIX QML_FILES "animation.qml" "basics/animators.qml" diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt index 8a33e76fb9..7957e007be 100644 --- a/examples/quick/canvas/CMakeLists.txt +++ b/examples/quick/canvas/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/canvas") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -31,7 +31,6 @@ target_link_libraries(canvasexample PRIVATE qt_add_qml_module(canvasexample URI canvas - AUTO_RESOURCE_PREFIX QML_FILES "LabeledSlider.qml" "bezierCurve/bezierCurve.qml" 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 ) diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt index cd8edd2524..ea991b5840 100644 --- a/examples/quick/delegatechooser/CMakeLists.txt +++ b/examples/quick/delegatechooser/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/delegatechooser") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -29,7 +29,6 @@ add_dependencies(delegatechooserexample delegatechooser_shared) qt_add_qml_module(delegatechooserexample URI delegatechooser - AUTO_RESOURCE_PREFIX QML_FILES "delegatechooser.qml" ) diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt index 78fbe5da6b..0b1755c231 100644 --- a/examples/quick/draganddrop/CMakeLists.txt +++ b/examples/quick/draganddrop/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/draganddrop") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -24,7 +24,6 @@ qt_add_executable(draganddropexample qt_add_qml_module(draganddropexample URI draganddrop - AUTO_RESOURCE_PREFIX QML_FILES "draganddrop.qml" "tiles/DragTile.qml" diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index 0a52518444..c9e222f007 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/embeddedinwidgets") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Widgets) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(embeddedinwidgetsexample WIN32 MACOSX_BUNDLE main.cpp @@ -28,7 +28,6 @@ target_link_libraries(embeddedinwidgetsexample PRIVATE # Resources: qt_add_qml_module(embeddedinwidgetsexample URI embeddedinwidgets - AUTO_RESOURCE_PREFIX QML_FILES "main.qml" RESOURCES diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt index 3c31d55fa4..49820ac6f4 100644 --- a/examples/quick/externaldraganddrop/CMakeLists.txt +++ b/examples/quick/externaldraganddrop/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/externaldraganddrop") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(externaldraganddropexample WIN32 @@ -22,7 +22,6 @@ qt_add_executable(externaldraganddropexample qt_add_qml_module(externaldraganddropexample URI externaldraganddrop - AUTO_RESOURCE_PREFIX QML_FILES "DragAndDropTextItem.qml" "externaldraganddrop.qml" diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index 905a70d55d..4b86a03923 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/imageelements") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -31,7 +31,6 @@ target_link_libraries(imageelementsexample PRIVATE qt_add_qml_module(imageelementsexample URI imageelements - AUTO_RESOURCE_PREFIX QML_FILES "animatedimage.qml" "animatedsprite.qml" diff --git a/examples/quick/imageprovider/CMakeLists.txt b/examples/quick/imageprovider/CMakeLists.txt index 0b880da74b..4a158fd4be 100644 --- a/examples/quick/imageprovider/CMakeLists.txt +++ b/examples/quick/imageprovider/CMakeLists.txt @@ -15,9 +15,10 @@ set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/quick/imageprovider) find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt6_add_qml_module(qmlimageproviderplugin URI "ImageProviderCore" - AUTO_RESOURCE_PREFIX PLUGIN_TARGET qmlimageproviderplugin NO_PLUGIN_OPTIONAL NO_GENERATE_PLUGIN_SOURCE diff --git a/examples/quick/imageresponseprovider/CMakeLists.txt b/examples/quick/imageresponseprovider/CMakeLists.txt index 0e64832d1a..ad3ff77758 100644 --- a/examples/quick/imageresponseprovider/CMakeLists.txt +++ b/examples/quick/imageresponseprovider/CMakeLists.txt @@ -15,9 +15,10 @@ set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/quick/imageresponseprov find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt6_add_qml_module(qmlimageresponseproviderplugin URI "ImageResponseProviderCore" - AUTO_RESOURCE_PREFIX PLUGIN_TARGET qmlimageresponseproviderplugin NO_PLUGIN_OPTIONAL NO_GENERATE_PLUGIN_SOURCE diff --git a/examples/quick/itemvariablerefreshrate/CMakeLists.txt b/examples/quick/itemvariablerefreshrate/CMakeLists.txt index a08fc01aca..2b6c4fe26d 100644 --- a/examples/quick/itemvariablerefreshrate/CMakeLists.txt +++ b/examples/quick/itemvariablerefreshrate/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/itemvariablerefreshrate") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(itemvariablerefreshrateexample WIN32 @@ -29,7 +29,6 @@ target_link_libraries(itemvariablerefreshrateexample PRIVATE qt_add_qml_module(itemvariablerefreshrateexample URI itemvariablerefreshrate - AUTO_RESOURCE_PREFIX QML_FILES "itemvariablerefreshrate.qml" RESOURCES diff --git a/examples/quick/keyinteraction/CMakeLists.txt b/examples/quick/keyinteraction/CMakeLists.txt index 6524b87fcf..58c9e9f0d5 100644 --- a/examples/quick/keyinteraction/CMakeLists.txt +++ b/examples/quick/keyinteraction/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/keyinteraction") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(keyinteractionexample WIN32 MACOSX_BUNDLE main.cpp @@ -28,7 +28,6 @@ target_link_libraries(keyinteractionexample PRIVATE # Resources: qt_add_qml_module(keyinteractionexample URI keyinteraction - AUTO_RESOURCE_PREFIX QML_FILES "ContextMenu.qml" "GridMenu.qml" diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt index 74235b1553..679dda27e8 100644 --- a/examples/quick/layouts/CMakeLists.txt +++ b/examples/quick/layouts/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/layouts") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(layoutsexample WIN32 @@ -22,7 +22,6 @@ qt_add_executable(layoutsexample qt_add_qml_module(layoutsexample URI layouts - AUTO_RESOURCE_PREFIX QML_FILES "layouts.qml" ) diff --git a/examples/quick/localstorage/CMakeLists.txt b/examples/quick/localstorage/CMakeLists.txt index cd19eca89b..495db588e8 100644 --- a/examples/quick/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/localstorage") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(localstorageexample WIN32 @@ -22,7 +22,6 @@ qt_add_executable(localstorageexample qt_add_qml_module(localstorageexample URI localstorage - AUTO_RESOURCE_PREFIX QML_FILES "Database.js" "Header.qml" diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt index 27837d3b31..687685c538 100644 --- a/examples/quick/models/abstractitemmodel/CMakeLists.txt +++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/abstractitemmodel") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(abstractitemmodelexample WIN32 MACOSX_BUNDLE main.cpp @@ -29,7 +29,6 @@ target_link_libraries(abstractitemmodelexample PRIVATE # Resources: qt_add_qml_module(abstractitemmodelexample URI abstractitemmodel - AUTO_RESOURCE_PREFIX QML_FILES "view.qml" ) diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt index e4d5ed35e4..f0da3b4467 100644 --- a/examples/quick/models/objectlistmodel/CMakeLists.txt +++ b/examples/quick/models/objectlistmodel/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/objectlistmodel") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(objectlistmodelexample WIN32 MACOSX_BUNDLE dataobject.cpp dataobject.h @@ -29,7 +29,6 @@ target_link_libraries(objectlistmodelexample PRIVATE # Resources: qt_add_qml_module(objectlistmodelexample URI objectlistmodel - AUTO_RESOURCE_PREFIX QML_FILES "view.qml" ) diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt index 6846331831..b74be36d65 100644 --- a/examples/quick/models/stringlistmodel/CMakeLists.txt +++ b/examples/quick/models/stringlistmodel/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/stringlistmodel") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(stringlistmodelexample WIN32 MACOSX_BUNDLE main.cpp @@ -28,7 +28,6 @@ target_link_libraries(stringlistmodelexample PRIVATE # Resources: qt_add_qml_module(stringlistmodelexample URI stringlistmodel - AUTO_RESOURCE_PREFIX QML_FILES "view.qml" ) diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt index 89a16690a3..925d94ac1b 100644 --- a/examples/quick/mousearea/CMakeLists.txt +++ b/examples/quick/mousearea/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/mousearea") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(mouseareaexample WIN32 MACOSX_BUNDLE main.cpp @@ -28,7 +28,6 @@ target_link_libraries(mouseareaexample PRIVATE # Resources: qt_add_qml_module(mouseareaexample URI mousearea - AUTO_RESOURCE_PREFIX QML_FILES "mousearea-wheel-example.qml" "mousearea.qml" diff --git a/examples/quick/multieffect/itemswitcher/CMakeLists.txt b/examples/quick/multieffect/itemswitcher/CMakeLists.txt index 922b6b8023..bd598d1f5f 100644 --- a/examples/quick/multieffect/itemswitcher/CMakeLists.txt +++ b/examples/quick/multieffect/itemswitcher/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/multieffect/itemswitcher") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(itemswitcherexample itemswitcher_shared) # Resources: qt_add_qml_module(itemswitcherexample URI itemswitcher - AUTO_RESOURCE_PREFIX QML_FILES "qml/main.qml" "qml/PagesView.qml" diff --git a/examples/quick/multieffect/testbed/CMakeLists.txt b/examples/quick/multieffect/testbed/CMakeLists.txt index 3a21a0c1fd..4461a8a13e 100644 --- a/examples/quick/multieffect/testbed/CMakeLists.txt +++ b/examples/quick/multieffect/testbed/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/multieffect/testbed") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(testbedexample testbed_shared) # Resources: qt_add_qml_module(testbedexample URI testbed - AUTO_RESOURCE_PREFIX QML_FILES "qml/FpsItem.qml" "qml/main.qml" diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 5f710fbdd8..0eb7dbc02d 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/affectors") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -32,7 +32,6 @@ add_dependencies(affectorsexample affectors_shared) # Resources: qt_add_qml_module(affectorsexample URI affectors - AUTO_RESOURCE_PREFIX QML_FILES "affectors.qml" "GreyButton.qml" diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index 8bb31beba6..defaa297f1 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/emitters") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -32,7 +32,6 @@ add_dependencies(emittersexample emitters_shared) # Resources: qt_add_qml_module(emittersexample URI emitters - AUTO_RESOURCE_PREFIX QML_FILES "burstandpulse.qml" "customemitter.qml" diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index 1bc4acd678..1bcf3b388d 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/imageparticle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -32,7 +32,6 @@ add_dependencies(imageparticleexample imageparticle_shared) # Resources: qt_add_qml_module(imageparticleexample URI imageparticle - AUTO_RESOURCE_PREFIX QML_FILES "allatonce.qml" "colored.qml" diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index 77fe5a4961..ca3522e256 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/itemparticle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -32,7 +32,6 @@ add_dependencies(itemparticleexample itemparticle_shared) # Resources: qt_add_qml_module(itemparticleexample URI itemparticle - AUTO_RESOURCE_PREFIX QML_FILES "itemparticle.qml" "delegates.qml" diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index d224d607ce..f72ce58e3b 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/system") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../../shared" "shared") @@ -32,7 +32,6 @@ add_dependencies(systemexample system_shared) # Resources: qt_add_qml_module(systemexample URI system - AUTO_RESOURCE_PREFIX QML_FILES "dynamiccomparison.qml" "dynamicemitters.qml" diff --git a/examples/quick/pointerhandlers/CMakeLists.txt b/examples/quick/pointerhandlers/CMakeLists.txt index d0fdd89eae..0e870195a2 100644 --- a/examples/quick/pointerhandlers/CMakeLists.txt +++ b/examples/quick/pointerhandlers/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/pointerhandlers") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Svg) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -30,7 +30,6 @@ add_dependencies(pointerhandlersexample pointerhandlers_shared) qt_add_qml_module(pointerhandlersexample URI pointerhandlers - AUTO_RESOURCE_PREFIX QML_FILES "components/Button.qml" "components/CheckBox.qml" diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt index 213173557e..6b1eda067b 100644 --- a/examples/quick/positioners/CMakeLists.txt +++ b/examples/quick/positioners/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/positioners") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -24,7 +24,6 @@ qt_add_executable(positionersexample qt_add_qml_module(positionersexample URI positioners - AUTO_RESOURCE_PREFIX QML_FILES "positioners-attachedproperties.qml" "positioners-transitions.qml" diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt index 1ddb70eef9..bec855f963 100644 --- a/examples/quick/quick-accessibility/CMakeLists.txt +++ b/examples/quick/quick-accessibility/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quick-accessibility") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(quick-accessibility WIN32 @@ -31,7 +31,6 @@ target_link_libraries(quick-accessibility PRIVATE qt_add_qml_module(quick-accessibility URI accessibility - AUTO_RESOURCE_PREFIX QML_FILES "accessibility.qml" "Button.qml" diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt index ccdd6ed528..c99fc57127 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(rendercontrol_d3d11example WIN32 MACOSX_BUNDLE engine.cpp engine.h main.cpp @@ -34,7 +36,6 @@ target_link_libraries(rendercontrol_d3d11example PUBLIC # Resources: qt_add_qml_module(rendercontrol_d3d11example URI rendercontrol - AUTO_RESOURCE_PREFIX QML_FILES "demo.qml" ) diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt index 85399d8701..aa5dc7422b 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(rendercontrol_openglexample WIN32 MACOSX_BUNDLE cuberenderer.cpp cuberenderer.h @@ -31,7 +31,6 @@ target_link_libraries(rendercontrol_openglexample PRIVATE # Resources: qt_add_qml_module(rendercontrol_openglexample URI rendercontrol - AUTO_RESOURCE_PREFIX QML_FILES "demo.qml" ) diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt index d040edce6d..421bc8cb90 100644 --- a/examples/quick/righttoleft/CMakeLists.txt +++ b/examples/quick/righttoleft/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/righttoleft") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -24,7 +24,6 @@ qt_add_executable(righttoleftexample qt_add_qml_module(righttoleftexample URI righttoleft - AUTO_RESOURCE_PREFIX QML_FILES "layoutdirection/layoutdirection.qml" "layoutmirroring/layoutmirroring.qml" diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt index 3441dfaa1c..e975190332 100644 --- a/examples/quick/shadereffects/CMakeLists.txt +++ b/examples/quick/shadereffects/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/shadereffects") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick ShaderTools) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(shadereffectsexample WIN32 @@ -29,7 +29,6 @@ target_link_libraries(shadereffectsexample PRIVATE qt_add_qml_module(shadereffectsexample URI shadereffects - AUTO_RESOURCE_PREFIX QML_FILES "shadereffects.qml" RESOURCES diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt index 40fd459bf0..37ed8aa561 100644 --- a/examples/quick/shapes/CMakeLists.txt +++ b/examples/quick/shapes/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/shapes") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(shapesexample shapes_shared) qt_add_qml_module(shapesexample URI shapes - AUTO_RESOURCE_PREFIX QML_FILES "clippedtigers.qml" "interactive.qml" diff --git a/examples/quick/shared/CMakeLists.txt b/examples/quick/shared/CMakeLists.txt index 159f1e8699..704d148025 100644 --- a/examples/quick/shared/CMakeLists.txt +++ b/examples/quick/shared/CMakeLists.txt @@ -16,7 +16,6 @@ qt_add_qml_module(${PROJECT_NAME}_shared URI shared VERSION 2.2 PLUGIN_TARGET ${PROJECT_NAME}_shared - AUTO_RESOURCE_PREFIX SOURCES "shared.h" QML_FILES diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index 31076c5339..463fb4ec53 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/text") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(textexample text_shared) qt_add_qml_module(textexample URI text - AUTO_RESOURCE_PREFIX QML_FILES "fonts/availableFonts.qml" "fonts/banner.qml" diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt index 0eb73afc76..aaa1731f0d 100644 --- a/examples/quick/threading/CMakeLists.txt +++ b/examples/quick/threading/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/threading") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(threadingexample threading_shared) qt_add_qml_module(threadingexample URI threading - AUTO_RESOURCE_PREFIX QML_FILES "threadedlistmodel/dataloader.mjs" "threadedlistmodel/timedisplay.qml" diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt index 3a0ced72f9..39cd50e5f5 100644 --- a/examples/quick/touchinteraction/CMakeLists.txt +++ b/examples/quick/touchinteraction/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/touchinteraction") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -33,7 +33,6 @@ add_dependencies(touchinteractionexample touchinteraction_shared) qt_add_qml_module(touchinteractionexample URI touchinteraction - AUTO_RESOURCE_PREFIX QML_FILES "flickable/Panel.qml" "flickable/basic-flickable.qml" 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" diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt index 0eadd33a5a..1ce809977c 100644 --- a/examples/quick/views/CMakeLists.txt +++ b/examples/quick/views/CMakeLists.txt @@ -14,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/views") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + add_subdirectory("../shared" "shared") qt_add_executable(viewsexample @@ -36,7 +38,6 @@ add_dependencies(viewsexample views_shared) qt_add_qml_module(viewsexample URI views - AUTO_RESOURCE_PREFIX QML_FILES "delegatemodel/dragselection.qml" "delegatemodel/slideshow.qml" diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt index 31932654ea..cb69ec4b36 100644 --- a/examples/quick/window/CMakeLists.txt +++ b/examples/quick/window/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/window") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory("../shared" "shared") @@ -31,7 +31,6 @@ target_link_libraries(windowexample PRIVATE qt_add_qml_module(windowexample URI window - AUTO_RESOURCE_PREFIX QML_FILES "AllScreens.qml" "CurrentScreen.qml" diff --git a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt index 4228052a26..d08d238e46 100644 --- a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt @@ -10,7 +10,8 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml QuickControls2) -qt_standard_project_setup() + +qt_standard_project_setup(REQUIRES 6.5) add_subdirectory(MyStyle) diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 11ac6e003d..fb83797c4c 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -429,6 +429,11 @@ function(qt6_add_qml_module target) ) else() set(arg_RESOURCE_PREFIX "/qt/qml") + message(DEPRECATION "AUTO_RESOURCE_PREFIX is deprecated. " + "Please use the qt_policy(SET) command to set the QTP0001 policy, " + "or use the qt_standard_project_setup() command to set your preferred " + "REQUIRES to get the preferred behavior. " + "Check https://doc.qt.io/qt-6/qt-cmake-policy-qtp0001.html for policy details.") endif() elseif(arg_RESOURCE_PREFIX) _qt_internal_canonicalize_resource_path("${arg_RESOURCE_PREFIX}" arg_RESOURCE_PREFIX) diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index 0b60a0092b..a60bec4ee7 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -17,11 +17,12 @@ qt_add_library(testCppTypes STATIC) qt_autogen_tools_initial_setup(testCppTypes) target_link_libraries(testCppTypes PRIVATE Qt::Qml Qt::QmlPrivate Qt::Quick) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(testCppTypes URI TestTypes SOURCES commontypes.h - AUTO_RESOURCE_PREFIX OUTPUT_DIRECTORY TestTypes ) qt_autogen_tools_initial_setup(testCppTypesplugin) diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index 5966e268e2..7a045e2760 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -223,11 +223,12 @@ set_target_properties(codegen_test_module PROPERTIES QT_QMLCACHEGEN_EXECUTABLE qmlcachegen ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(codegen_test_module VERSION 1.5 URI TestTypes IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/imports/" - AUTO_RESOURCE_PREFIX DEPENDENCIES QtQuick QtQuick.Templates diff --git a/tests/auto/qml/qmlsplitlib/CMakeLists.txt b/tests/auto/qml/qmlsplitlib/CMakeLists.txt index 523ab5cbfd..f9783941c2 100644 --- a/tests/auto/qml/qmlsplitlib/CMakeLists.txt +++ b/tests/auto/qml/qmlsplitlib/CMakeLists.txt @@ -24,9 +24,10 @@ qt_autogen_tools_initial_setup(tst_qmlsplitlib) qt6_generate_foreign_qml_types(tst_qmlsplitlib_library tst_qmlsplitlib) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmlsplitlib URI "SplitLib" - AUTO_RESOURCE_PREFIX QML_FILES main.qml ) diff --git a/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt b/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt index dc9a25a33a..425c2d0beb 100644 --- a/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt +++ b/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt @@ -164,10 +164,11 @@ qt_internal_add_resource(qmltc_test_module "qmake_immediate" ${qmake_immediate_resource_files} ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(qmltc_test_module VERSION 1.0 URI QmltcTests - AUTO_RESOURCE_PREFIX SOURCES ${cpp_sources} QML_FILES diff --git a/tests/auto/qml/qmltc_manual/CMakeLists.txt b/tests/auto/qml/qmltc_manual/CMakeLists.txt index 8101bcbcea..15858492e9 100644 --- a/tests/auto/qml/qmltc_manual/CMakeLists.txt +++ b/tests/auto/qml/qmltc_manual/CMakeLists.txt @@ -19,9 +19,10 @@ qt_internal_add_test(tst_qmltc_manual TESTDATA ${test_data} ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmltc_manual URI "QmltcManualTests" - AUTO_RESOURCE_PREFIX QML_FILES ${test_data} ) diff --git a/tests/auto/qml/qmltc_qprocess/CMakeLists.txt b/tests/auto/qml/qmltc_qprocess/CMakeLists.txt index bac445dec8..c3590f73d1 100644 --- a/tests/auto/qml/qmltc_qprocess/CMakeLists.txt +++ b/tests/auto/qml/qmltc_qprocess/CMakeLists.txt @@ -14,10 +14,11 @@ qt_internal_add_test(tst_qmltc_qprocess set_source_files_properties(data/SingletonThing.qml data/singletonUncreatable.qml PROPERTIES QT_QML_SINGLETON_TYPE true) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmltc_qprocess VERSION 1.0 URI QmltcQProcessTests - AUTO_RESOURCE_PREFIX SOURCES cpptypes/testtype.h DEPENDENCIES diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 039f1647db..a0d26b733a 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -76,9 +76,11 @@ qt_add_library(tst-qmltyperegistrar-with-dashes) qt_autogen_tools_initial_setup(tst-qmltyperegistrar-with-dashes) target_link_libraries(tst-qmltyperegistrar-with-dashes PRIVATE Qt::Core Qt::Qml) qt_enable_autogen_tool(tst-qmltyperegistrar-with-dashes "moc" ON) + +qt_policy(SET QTP0001 NEW) + qt_add_qml_module(tst-qmltyperegistrar-with-dashes URI Module-With-Dashes - AUTO_RESOURCE_PREFIX SOURCES foo.cpp foo.h OUTPUT_DIRECTORY Module-With-Dashes diff --git a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt index cb020e95e0..d469f1e97f 100644 --- a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt @@ -2,13 +2,15 @@ # SPDX-License-Identifier: BSD-3-Clause # Use NO_GENERATE_QMLTYPES to avoid static asserts during compilation of the types to be tested, same for NO_PLUGIN + +qt_policy(SET QTP0001 NEW) + qt_add_qml_module(UnregisteredTypes STATIC URI UnregisteredTypes NO_GENERATE_QMLTYPES NO_PLUGIN SOURCES uncreatable.h - AUTO_RESOURCE_PREFIX ) qt_enable_autogen_tool(UnregisteredTypes "moc" ON) diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index cab87ac08d..2d3b7177ac 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -36,10 +36,11 @@ if(TARGET Qt::QuickControls2) target_compile_definitions(tst_qqmlcomponent PRIVATE HAS_CONTROLS) endif() +qt_policy(SET QTP0001 NEW) + qt_add_qml_module( tst_qqmlcomponent URI test - AUTO_RESOURCE_PREFIX QML_FILES "data/TestComponentWithIC.qml" "data/withAot.qml" diff --git a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt index 3431398f47..5215159373 100644 --- a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt +++ b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt @@ -8,9 +8,10 @@ qt_autogen_tools_initial_setup(qqmljsscope_test_module) target_include_directories(qqmljsscope_test_module PUBLIC cpptypes/) target_link_libraries(qqmljsscope_test_module PUBLIC Qt::Core Qt::Qml Qt::Gui) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(qqmljsscope_test_module URI QQmlJSScopeTests - AUTO_RESOURCE_PREFIX SOURCES singleton.h singleton.cpp extensiontypes.h diff --git a/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt b/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt index 8f918dd753..7ade399312 100644 --- a/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt +++ b/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt @@ -40,7 +40,8 @@ qt_internal_add_shaders(tst_qquickitemrhiintegration "shaders" "texture.frag" ) +qt_policy(SET QTP0001 NEW) + qt_add_qml_module(tst_qquickitemrhiintegration URI TestQquickitemrhiintegration - AUTO_RESOURCE_PREFIX ) diff --git a/tests/auto/quick/qquicklistview2/CMakeLists.txt b/tests/auto/quick/qquicklistview2/CMakeLists.txt index 6af00b60e8..cc8a6ea726 100644 --- a/tests/auto/quick/qquicklistview2/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview2/CMakeLists.txt @@ -23,9 +23,10 @@ qt_internal_add_test(tst_qquicklistview2 TESTDATA ${test_data} ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qquicklistview2 URI Test - AUTO_RESOURCE_PREFIX ) qt_internal_extend_target(tst_qquicklistview2 CONDITION ANDROID OR IOS