From 2d44365f69b9bc946d085c6b149e2ac319700265 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 10 Jun 2022 15:51:08 +0200 Subject: CMake: Allow omitting the version of QML modules Also, drop all the VERSION 1.0 lines from the examples and tests. 1.0 is actually a bad default version since it's before all the Qt versions. [ChangeLog][QML] You can now omit the VERSION argument to qt_add_qml_module(). This will automatically generate the highest possible version. Pick-to: 6.5 Task-number: QTBUG-99146 Change-Id: Ic10ec69b87c224e0e94e1785f65653815d4c778c Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev Reviewed-by: Fabian Kosmale Reviewed-by: Sami Shalayel --- examples/qml/dynamicscene/CMakeLists.txt | 1 - examples/qml/networkaccessmanagerfactory/CMakeLists.txt | 1 - examples/qml/qml-i18n/CMakeLists.txt | 1 - examples/qml/qmlextensionplugins/CMakeLists.txt | 1 - examples/qml/referenceexamples/adding/CMakeLists.txt | 1 - examples/qml/referenceexamples/attached/CMakeLists.txt | 1 - examples/qml/referenceexamples/binding/CMakeLists.txt | 1 - examples/qml/referenceexamples/coercion/CMakeLists.txt | 1 - examples/qml/referenceexamples/default/CMakeLists.txt | 1 - examples/qml/referenceexamples/extended/CMakeLists.txt | 1 - examples/qml/referenceexamples/grouped/CMakeLists.txt | 1 - examples/qml/referenceexamples/methods/CMakeLists.txt | 1 - examples/qml/referenceexamples/properties/CMakeLists.txt | 1 - examples/qml/referenceexamples/signal/CMakeLists.txt | 1 - examples/qml/referenceexamples/valuesource/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter1-basics/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter2-methods/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter3-bindings/CMakeLists.txt | 1 - .../chapter4-customPropertyTypes/CMakeLists.txt | 1 - .../extending-qml/chapter5-listproperties/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter6-plugins/CMakeLists.txt | 1 - .../extending-qml/chapter6-plugins/Charts/CMakeLists.txt | 1 - examples/qml/xmlhttprequest/CMakeLists.txt | 1 - examples/quick/animation/CMakeLists.txt | 1 - examples/quick/canvas/CMakeLists.txt | 1 - examples/quick/customitems/dialcontrol/CMakeLists.txt | 1 - examples/quick/customitems/flipable/CMakeLists.txt | 1 - examples/quick/customitems/maskedmousearea/CMakeLists.txt | 1 - examples/quick/customitems/painteditem/CMakeLists.txt | 1 - .../quick/customitems/painteditem/TextBalloon/CMakeLists.txt | 1 - examples/quick/delegatechooser/CMakeLists.txt | 1 - examples/quick/draganddrop/CMakeLists.txt | 1 - examples/quick/embeddedinwidgets/CMakeLists.txt | 1 - examples/quick/externaldraganddrop/CMakeLists.txt | 1 - examples/quick/imageelements/CMakeLists.txt | 1 - examples/quick/imageprovider/CMakeLists.txt | 1 - examples/quick/imageresponseprovider/CMakeLists.txt | 1 - examples/quick/itemvariablerefreshrate/CMakeLists.txt | 1 - examples/quick/keyinteraction/CMakeLists.txt | 1 - examples/quick/layouts/CMakeLists.txt | 1 - examples/quick/localstorage/CMakeLists.txt | 1 - examples/quick/models/abstractitemmodel/CMakeLists.txt | 1 - examples/quick/models/objectlistmodel/CMakeLists.txt | 1 - examples/quick/models/stringlistmodel/CMakeLists.txt | 1 - examples/quick/mousearea/CMakeLists.txt | 1 - examples/quick/multieffect/itemswitcher/CMakeLists.txt | 1 - examples/quick/multieffect/testbed/CMakeLists.txt | 1 - examples/quick/particles/affectors/CMakeLists.txt | 1 - examples/quick/particles/emitters/CMakeLists.txt | 1 - examples/quick/particles/imageparticle/CMakeLists.txt | 1 - examples/quick/particles/itemparticle/CMakeLists.txt | 1 - examples/quick/particles/system/CMakeLists.txt | 1 - examples/quick/pointerhandlers/CMakeLists.txt | 1 - examples/quick/positioners/CMakeLists.txt | 1 - examples/quick/quick-accessibility/CMakeLists.txt | 1 - .../qquickwidgetversuswindow_opengl/CMakeLists.txt | 1 - examples/quick/quickwidgets/quickwidget/CMakeLists.txt | 1 - .../quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt | 1 - .../quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt | 1 - examples/quick/righttoleft/CMakeLists.txt | 1 - examples/quick/scenegraph/customgeometry/CMakeLists.txt | 1 - examples/quick/scenegraph/custommaterial/CMakeLists.txt | 1 - examples/quick/scenegraph/customrendernode/CMakeLists.txt | 1 - examples/quick/scenegraph/d3d11underqml/CMakeLists.txt | 1 - examples/quick/scenegraph/fboitem/CMakeLists.txt | 1 - examples/quick/scenegraph/graph/CMakeLists.txt | 1 - examples/quick/scenegraph/metaltextureimport/CMakeLists.txt | 1 - examples/quick/scenegraph/metalunderqml/CMakeLists.txt | 1 - examples/quick/scenegraph/openglunderqml/CMakeLists.txt | 1 - examples/quick/scenegraph/threadedanimation/CMakeLists.txt | 1 - examples/quick/scenegraph/twotextureproviders/CMakeLists.txt | 1 - examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt | 1 - examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt | 1 - examples/quick/shadereffects/CMakeLists.txt | 1 - examples/quick/shapes/CMakeLists.txt | 1 - examples/quick/tableview/gameoflife/CMakeLists.txt | 1 - examples/quick/tableview/pixelator/CMakeLists.txt | 1 - examples/quick/text/CMakeLists.txt | 1 - examples/quick/threading/CMakeLists.txt | 1 - examples/quick/touchinteraction/CMakeLists.txt | 1 - .../quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt | 1 - .../quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt | 1 - .../quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt | 1 - .../quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt | 1 - examples/quick/tutorials/samegame/samegame1/CMakeLists.txt | 1 - examples/quick/tutorials/samegame/samegame2/CMakeLists.txt | 1 - examples/quick/tutorials/samegame/samegame3/CMakeLists.txt | 1 - examples/quick/tutorials/samegame/samegame4/CMakeLists.txt | 1 - examples/quick/views/CMakeLists.txt | 1 - examples/quick/window/CMakeLists.txt | 1 - .../quickcontrols/attachedstyleproperties/CMakeLists.txt | 1 - .../attachedstyleproperties/MyStyle/CMakeLists.txt | 1 - examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt | 1 - examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt | 1 - examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt | 1 - examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt | 1 - examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt | 1 - examples/quickcontrols/contactlist/CMakeLists.txt | 1 - examples/quickcontrols/eventcalendar/CMakeLists.txt | 1 - examples/quickcontrols/flatstyle/CMakeLists.txt | 1 - examples/quickcontrols/gallery/CMakeLists.txt | 1 - examples/quickcontrols/imagine/automotive/CMakeLists.txt | 1 - examples/quickcontrols/imagine/musicplayer/CMakeLists.txt | 1 - examples/quickcontrols/ios/todolist/CMakeLists.txt | 1 - examples/quickcontrols/sidepanel/CMakeLists.txt | 1 - examples/quickcontrols/swipetoremove/CMakeLists.txt | 1 - examples/quickcontrols/texteditor/CMakeLists.txt | 1 - src/qml/Qt6QmlMacros.cmake | 12 +++--------- src/qml/doc/snippets/qmltc/CMakeLists.txt | 1 - src/qml/doc/snippets/qmltc/myApp.qml | 2 +- src/qml/doc/src/cmake/qt_add_qml_module.qdoc | 11 +++++++++-- tests/auto/qml/debugger/qv4debugger/CMakeLists.txt | 1 - tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt | 1 - tests/auto/qml/qmlbasicapp/CMakeLists.txt | 1 - tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt | 1 - tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp | 4 ++-- tests/auto/qml/qmlcachegen/CMakeLists.txt | 1 - tests/auto/qml/qmlsplitlib/CMakeLists.txt | 1 - tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt | 1 - tests/auto/qml/qmltc_manual/CMakeLists.txt | 1 - tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 1 - .../qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt | 1 - tests/auto/qml/qqmlcomponent/CMakeLists.txt | 1 - tests/auto/qml/qqmlengine/CMakeLists.txt | 1 - tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt | 1 - tests/auto/qml/qqmljsscope/data/extensions.qml | 2 +- .../auto/qml/qqmljsscope/data/functionAndBindingIndices.qml | 2 +- tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt | 1 - tests/auto/quick/qquicklistview2/CMakeLists.txt | 1 - 129 files changed, 17 insertions(+), 139 deletions(-) diff --git a/examples/qml/dynamicscene/CMakeLists.txt b/examples/qml/dynamicscene/CMakeLists.txt index 28fc8a0664..b91ed5aca7 100644 --- a/examples/qml/dynamicscene/CMakeLists.txt +++ b/examples/qml/dynamicscene/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries(dynamicsceneexample PUBLIC qt_add_qml_module(dynamicsceneexample URI dynamicscene - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "GenericSceneItem.qml" diff --git a/examples/qml/networkaccessmanagerfactory/CMakeLists.txt b/examples/qml/networkaccessmanagerfactory/CMakeLists.txt index 562490e1ec..e50a97ab8c 100644 --- a/examples/qml/networkaccessmanagerfactory/CMakeLists.txt +++ b/examples/qml/networkaccessmanagerfactory/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(networkaccessmanagerfactory PUBLIC qt_add_qml_module(networkaccessmanagerfactory URI Example - VERSION 1.0 QML_FILES view.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/qml-i18n/CMakeLists.txt b/examples/qml/qml-i18n/CMakeLists.txt index 26ebd00ead..83bec4d11b 100644 --- a/examples/qml/qml-i18n/CMakeLists.txt +++ b/examples/qml/qml-i18n/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries(qmli18n PRIVATE qt_add_qml_module(qmli18n URI i18n - VERSION 1.0 QML_FILES qml-i18n.qml NO_RESOURCE_TARGET_PATH diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt index aecf65cac8..753f05b173 100644 --- a/examples/qml/qmlextensionplugins/CMakeLists.txt +++ b/examples/qml/qmlextensionplugins/CMakeLists.txt @@ -35,7 +35,6 @@ endforeach() #![1] qt_add_qml_module(qmlqtimeexample OUTPUT_DIRECTORY imports/TimeExample - VERSION 1.0 URI "TimeExample" SOURCES timemodel.cpp timemodel.h AUTO_RESOURCE_PREFIX diff --git a/examples/qml/referenceexamples/adding/CMakeLists.txt b/examples/qml/referenceexamples/adding/CMakeLists.txt index 098c95e00c..f1d3fc6eac 100644 --- a/examples/qml/referenceexamples/adding/CMakeLists.txt +++ b/examples/qml/referenceexamples/adding/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(adding PUBLIC qt_add_qml_module(adding URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/attached/CMakeLists.txt b/examples/qml/referenceexamples/attached/CMakeLists.txt index 38e08f7b62..ce4ff3e80f 100644 --- a/examples/qml/referenceexamples/attached/CMakeLists.txt +++ b/examples/qml/referenceexamples/attached/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(attached PUBLIC qt_add_qml_module(attached URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/binding/CMakeLists.txt b/examples/qml/referenceexamples/binding/CMakeLists.txt index f0d3cf4669..83ad8001e8 100644 --- a/examples/qml/referenceexamples/binding/CMakeLists.txt +++ b/examples/qml/referenceexamples/binding/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(binding PUBLIC qt_add_qml_module(binding URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/coercion/CMakeLists.txt b/examples/qml/referenceexamples/coercion/CMakeLists.txt index c2592cba66..495b266f2f 100644 --- a/examples/qml/referenceexamples/coercion/CMakeLists.txt +++ b/examples/qml/referenceexamples/coercion/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(coercion PUBLIC qt_add_qml_module(coercion URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/default/CMakeLists.txt b/examples/qml/referenceexamples/default/CMakeLists.txt index 4889b8c824..681085f386 100644 --- a/examples/qml/referenceexamples/default/CMakeLists.txt +++ b/examples/qml/referenceexamples/default/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(default PUBLIC qt_add_qml_module(default URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/extended/CMakeLists.txt b/examples/qml/referenceexamples/extended/CMakeLists.txt index 7a625ac41e..6ecff60d0c 100644 --- a/examples/qml/referenceexamples/extended/CMakeLists.txt +++ b/examples/qml/referenceexamples/extended/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(extended PUBLIC qt_add_qml_module(extended URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/grouped/CMakeLists.txt b/examples/qml/referenceexamples/grouped/CMakeLists.txt index 1d84f2172d..b1c7587b58 100644 --- a/examples/qml/referenceexamples/grouped/CMakeLists.txt +++ b/examples/qml/referenceexamples/grouped/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(grouped PUBLIC qt_add_qml_module(grouped URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/methods/CMakeLists.txt b/examples/qml/referenceexamples/methods/CMakeLists.txt index eef33cb1fe..57c0733723 100644 --- a/examples/qml/referenceexamples/methods/CMakeLists.txt +++ b/examples/qml/referenceexamples/methods/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(methods PUBLIC qt_add_qml_module(methods URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/properties/CMakeLists.txt b/examples/qml/referenceexamples/properties/CMakeLists.txt index 5466f126ef..dbe521d17d 100644 --- a/examples/qml/referenceexamples/properties/CMakeLists.txt +++ b/examples/qml/referenceexamples/properties/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(properties PUBLIC qt_add_qml_module(properties URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/signal/CMakeLists.txt b/examples/qml/referenceexamples/signal/CMakeLists.txt index 24838eedd8..ce196f3a38 100644 --- a/examples/qml/referenceexamples/signal/CMakeLists.txt +++ b/examples/qml/referenceexamples/signal/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(signal PUBLIC qt_add_qml_module(signal URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/referenceexamples/valuesource/CMakeLists.txt b/examples/qml/referenceexamples/valuesource/CMakeLists.txt index 8abcd8f17e..266bb2b754 100644 --- a/examples/qml/referenceexamples/valuesource/CMakeLists.txt +++ b/examples/qml/referenceexamples/valuesource/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(valuesource PUBLIC qt_add_qml_module(valuesource URI People - VERSION 1.0 QML_FILES example.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt index ba2851b98d..02ed972ef5 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(chapter1-basics PUBLIC #![0] qt_add_qml_module(chapter1-basics URI Charts - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH DEPENDENCIES QtQuick diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt index 9e9da907fc..f0906cf380 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(chapter2-methods PUBLIC qt_add_qml_module(chapter2-methods URI Charts - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH DEPENDENCIES QtQuick diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt index 3803b6ac12..05c567fd30 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(chapter3-bindings PUBLIC qt_add_qml_module(chapter3-bindings URI Charts - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH DEPENDENCIES QtQuick diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt index 705bd1122a..3914819640 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(chapter4-customPropertyTypes PUBLIC #![1] qt_add_qml_module(chapter4-customPropertyTypes URI Charts - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH DEPENDENCIES QtQuick diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt index a256b1016f..d3b70f2017 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(chapter5-listproperties PUBLIC qt_add_qml_module(chapter5-listproperties URI Charts - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH DEPENDENCIES QtQuick diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt index 1a1ac64a0b..f1a7ef1b51 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt @@ -30,7 +30,6 @@ target_link_libraries(chapter6-plugins PRIVATE qt_add_qml_module(chapter6-plugins URI ChartsApp - VERSION 1.0 QML_FILES app.qml NO_RESOURCE_TARGET_PATH ) diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt index 0b21891905..714e44d2f0 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt @@ -2,7 +2,6 @@ # SPDX-License-Identifier: BSD-3-Clause qt6_add_qml_module(chartsplugin - VERSION 1.0 URI "Charts" PLUGIN_TARGET chartsplugin DEPENDENCIES QtQuick diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt index 554a671202..63d15c37dd 100644 --- a/examples/qml/xmlhttprequest/CMakeLists.txt +++ b/examples/qml/xmlhttprequest/CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_executable(xmlhttprequestexample qt_add_qml_module(xmlhttprequestexample URI xmlhttprequest - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "methods.js" diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt index 52fa6c0f44..1c9d954c42 100644 --- a/examples/quick/animation/CMakeLists.txt +++ b/examples/quick/animation/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(animationexample animation_shared) qt_add_qml_module(animationexample URI animation - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "animation.qml" diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt index 3af5dd355e..8a33e76fb9 100644 --- a/examples/quick/canvas/CMakeLists.txt +++ b/examples/quick/canvas/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(canvasexample PRIVATE qt_add_qml_module(canvasexample URI canvas - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "LabeledSlider.qml" diff --git a/examples/quick/customitems/dialcontrol/CMakeLists.txt b/examples/quick/customitems/dialcontrol/CMakeLists.txt index 2faef98374..e714908c52 100644 --- a/examples/quick/customitems/dialcontrol/CMakeLists.txt +++ b/examples/quick/customitems/dialcontrol/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(dialcontrolexample PUBLIC qt_add_qml_module(dialcontrolexample URI dialcontrol - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "Dial.qml" diff --git a/examples/quick/customitems/flipable/CMakeLists.txt b/examples/quick/customitems/flipable/CMakeLists.txt index a6611ba79a..1e9bec27c5 100644 --- a/examples/quick/customitems/flipable/CMakeLists.txt +++ b/examples/quick/customitems/flipable/CMakeLists.txt @@ -30,7 +30,6 @@ target_link_libraries(flipableexample PUBLIC qt_add_qml_module(flipableexample URI flipable - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "flipable.qml" diff --git a/examples/quick/customitems/maskedmousearea/CMakeLists.txt b/examples/quick/customitems/maskedmousearea/CMakeLists.txt index 145506bf9b..8c768bbc56 100644 --- a/examples/quick/customitems/maskedmousearea/CMakeLists.txt +++ b/examples/quick/customitems/maskedmousearea/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(maskedmousearea PUBLIC qt_add_qml_module(maskedmousearea URI Example - VERSION 1.0 QML_FILES maskedmousearea.qml RESOURCES diff --git a/examples/quick/customitems/painteditem/CMakeLists.txt b/examples/quick/customitems/painteditem/CMakeLists.txt index 2551d909d6..9f2d54bf8d 100644 --- a/examples/quick/customitems/painteditem/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/CMakeLists.txt @@ -21,7 +21,6 @@ qt_add_executable(painteditemexample WIN32 MACOSX_BUNDLE main.cpp) qt_add_qml_module(painteditemexample URI painteditem - VERSION 1.0 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 7be201de65..950e8ee616 100644 --- a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt +++ b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt @@ -8,7 +8,6 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/customitems/painteditem/TextBalloon") qt_add_qml_module(qmltextballoon - VERSION 1.0 URI "TextBalloon" PLUGIN_TARGET qmltextballoon AUTO_RESOURCE_PREFIX diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt index 6b624bd0e6..cd8edd2524 100644 --- a/examples/quick/delegatechooser/CMakeLists.txt +++ b/examples/quick/delegatechooser/CMakeLists.txt @@ -29,7 +29,6 @@ add_dependencies(delegatechooserexample delegatechooser_shared) qt_add_qml_module(delegatechooserexample URI delegatechooser - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "delegatechooser.qml" diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt index ece49e117a..78fbe5da6b 100644 --- a/examples/quick/draganddrop/CMakeLists.txt +++ b/examples/quick/draganddrop/CMakeLists.txt @@ -24,7 +24,6 @@ qt_add_executable(draganddropexample qt_add_qml_module(draganddropexample URI draganddrop - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "draganddrop.qml" diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index 7d9c58cc71..0a52518444 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(embeddedinwidgetsexample PRIVATE # Resources: qt_add_qml_module(embeddedinwidgetsexample URI embeddedinwidgets - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "main.qml" diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt index fd2b9be5c0..3c31d55fa4 100644 --- a/examples/quick/externaldraganddrop/CMakeLists.txt +++ b/examples/quick/externaldraganddrop/CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_executable(externaldraganddropexample qt_add_qml_module(externaldraganddropexample URI externaldraganddrop - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "DragAndDropTextItem.qml" diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index 9011880f65..905a70d55d 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(imageelementsexample PRIVATE qt_add_qml_module(imageelementsexample URI imageelements - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "animatedimage.qml" diff --git a/examples/quick/imageprovider/CMakeLists.txt b/examples/quick/imageprovider/CMakeLists.txt index 838a20d1a0..0b880da74b 100644 --- a/examples/quick/imageprovider/CMakeLists.txt +++ b/examples/quick/imageprovider/CMakeLists.txt @@ -16,7 +16,6 @@ set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/quick/imageprovider) find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) qt6_add_qml_module(qmlimageproviderplugin - VERSION 1.0 URI "ImageProviderCore" AUTO_RESOURCE_PREFIX PLUGIN_TARGET qmlimageproviderplugin diff --git a/examples/quick/imageresponseprovider/CMakeLists.txt b/examples/quick/imageresponseprovider/CMakeLists.txt index 1b296a4587..0e64832d1a 100644 --- a/examples/quick/imageresponseprovider/CMakeLists.txt +++ b/examples/quick/imageresponseprovider/CMakeLists.txt @@ -16,7 +16,6 @@ set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/quick/imageresponseprov find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) qt6_add_qml_module(qmlimageresponseproviderplugin - VERSION 1.0 URI "ImageResponseProviderCore" AUTO_RESOURCE_PREFIX PLUGIN_TARGET qmlimageresponseproviderplugin diff --git a/examples/quick/itemvariablerefreshrate/CMakeLists.txt b/examples/quick/itemvariablerefreshrate/CMakeLists.txt index 3d173e13c5..a08fc01aca 100644 --- a/examples/quick/itemvariablerefreshrate/CMakeLists.txt +++ b/examples/quick/itemvariablerefreshrate/CMakeLists.txt @@ -29,7 +29,6 @@ target_link_libraries(itemvariablerefreshrateexample PRIVATE qt_add_qml_module(itemvariablerefreshrateexample URI itemvariablerefreshrate - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "itemvariablerefreshrate.qml" diff --git a/examples/quick/keyinteraction/CMakeLists.txt b/examples/quick/keyinteraction/CMakeLists.txt index 96a47b0e67..6524b87fcf 100644 --- a/examples/quick/keyinteraction/CMakeLists.txt +++ b/examples/quick/keyinteraction/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(keyinteractionexample PRIVATE # Resources: qt_add_qml_module(keyinteractionexample URI keyinteraction - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "ContextMenu.qml" diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt index e1aafcf08b..74235b1553 100644 --- a/examples/quick/layouts/CMakeLists.txt +++ b/examples/quick/layouts/CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_executable(layoutsexample qt_add_qml_module(layoutsexample URI layouts - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "layouts.qml" diff --git a/examples/quick/localstorage/CMakeLists.txt b/examples/quick/localstorage/CMakeLists.txt index 0a6a9ebe51..cd19eca89b 100644 --- a/examples/quick/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_executable(localstorageexample qt_add_qml_module(localstorageexample URI localstorage - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "Database.js" diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt index b42afcdbf7..27837d3b31 100644 --- a/examples/quick/models/abstractitemmodel/CMakeLists.txt +++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt @@ -29,7 +29,6 @@ target_link_libraries(abstractitemmodelexample PRIVATE # Resources: qt_add_qml_module(abstractitemmodelexample URI abstractitemmodel - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "view.qml" diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt index 619bd0da2d..e4d5ed35e4 100644 --- a/examples/quick/models/objectlistmodel/CMakeLists.txt +++ b/examples/quick/models/objectlistmodel/CMakeLists.txt @@ -29,7 +29,6 @@ target_link_libraries(objectlistmodelexample PRIVATE # Resources: qt_add_qml_module(objectlistmodelexample URI objectlistmodel - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "view.qml" diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt index 6ca4013d0f..6846331831 100644 --- a/examples/quick/models/stringlistmodel/CMakeLists.txt +++ b/examples/quick/models/stringlistmodel/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(stringlistmodelexample PRIVATE # Resources: qt_add_qml_module(stringlistmodelexample URI stringlistmodel - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "view.qml" diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt index ff3d7893ba..89a16690a3 100644 --- a/examples/quick/mousearea/CMakeLists.txt +++ b/examples/quick/mousearea/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(mouseareaexample PRIVATE # Resources: qt_add_qml_module(mouseareaexample URI mousearea - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "mousearea-wheel-example.qml" diff --git a/examples/quick/multieffect/itemswitcher/CMakeLists.txt b/examples/quick/multieffect/itemswitcher/CMakeLists.txt index e0f5cde712..922b6b8023 100644 --- a/examples/quick/multieffect/itemswitcher/CMakeLists.txt +++ b/examples/quick/multieffect/itemswitcher/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(itemswitcherexample itemswitcher_shared) # Resources: qt_add_qml_module(itemswitcherexample URI itemswitcher - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "qml/main.qml" diff --git a/examples/quick/multieffect/testbed/CMakeLists.txt b/examples/quick/multieffect/testbed/CMakeLists.txt index fd4aa953db..71c448e1c6 100644 --- a/examples/quick/multieffect/testbed/CMakeLists.txt +++ b/examples/quick/multieffect/testbed/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(testbedexample testbed_shared) # Resources: qt_add_qml_module(testbedexample URI testbed - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "qml/FpsItem.qml" diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 64b40c9acf..5f710fbdd8 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -32,7 +32,6 @@ add_dependencies(affectorsexample affectors_shared) # Resources: qt_add_qml_module(affectorsexample URI affectors - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "affectors.qml" diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index 7a7b602a80..8bb31beba6 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -32,7 +32,6 @@ add_dependencies(emittersexample emitters_shared) # Resources: qt_add_qml_module(emittersexample URI emitters - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "burstandpulse.qml" diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index a2e576f23b..1bc4acd678 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -32,7 +32,6 @@ add_dependencies(imageparticleexample imageparticle_shared) # Resources: qt_add_qml_module(imageparticleexample URI imageparticle - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "allatonce.qml" diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index 03093e85f2..77fe5a4961 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -32,7 +32,6 @@ add_dependencies(itemparticleexample itemparticle_shared) # Resources: qt_add_qml_module(itemparticleexample URI itemparticle - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "itemparticle.qml" diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index 5df23081ac..d224d607ce 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -32,7 +32,6 @@ add_dependencies(systemexample system_shared) # Resources: qt_add_qml_module(systemexample URI system - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "dynamiccomparison.qml" diff --git a/examples/quick/pointerhandlers/CMakeLists.txt b/examples/quick/pointerhandlers/CMakeLists.txt index f24bde7436..d0fdd89eae 100644 --- a/examples/quick/pointerhandlers/CMakeLists.txt +++ b/examples/quick/pointerhandlers/CMakeLists.txt @@ -30,7 +30,6 @@ add_dependencies(pointerhandlersexample pointerhandlers_shared) qt_add_qml_module(pointerhandlersexample URI pointerhandlers - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "components/Button.qml" diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt index bda770a2af..213173557e 100644 --- a/examples/quick/positioners/CMakeLists.txt +++ b/examples/quick/positioners/CMakeLists.txt @@ -24,7 +24,6 @@ qt_add_executable(positionersexample qt_add_qml_module(positionersexample URI positioners - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "positioners-attachedproperties.qml" diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt index 1cc2e55526..1ddb70eef9 100644 --- a/examples/quick/quick-accessibility/CMakeLists.txt +++ b/examples/quick/quick-accessibility/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(quick-accessibility PRIVATE qt_add_qml_module(quick-accessibility URI accessibility - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "accessibility.qml" diff --git a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt index cb764dc720..14813bc9ec 100644 --- a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt +++ b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(qquickwidgetversuswindow_opengl PRIVATE qt_add_qml_module(qquickwidgetversuswindow_opengl URI fbitem - VERSION 1.0 QML_FILES test.qml RESOURCE_PREFIX /qquickwidgetversuswindow_opengl NO_RESOURCE_TARGET_PATH diff --git a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt index f4df528e79..ceb8b39da1 100644 --- a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt +++ b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt @@ -30,7 +30,6 @@ target_link_libraries(quickwidget PRIVATE qt_add_qml_module(quickwidget URI QuickWidgetExample - VERSION 1.0 QML_FILES rotatingsquare.qml RESOURCE_PREFIX /quickwidget diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt index 761b91544a..ccdd6ed528 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt @@ -35,7 +35,6 @@ target_link_libraries(rendercontrol_d3d11example PUBLIC qt_add_qml_module(rendercontrol_d3d11example URI rendercontrol AUTO_RESOURCE_PREFIX - VERSION 1.0 QML_FILES "demo.qml" ) diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt index d929d73fe0..85399d8701 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(rendercontrol_openglexample PRIVATE # Resources: qt_add_qml_module(rendercontrol_openglexample URI rendercontrol - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "demo.qml" diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt index 38138e03aa..d040edce6d 100644 --- a/examples/quick/righttoleft/CMakeLists.txt +++ b/examples/quick/righttoleft/CMakeLists.txt @@ -24,7 +24,6 @@ qt_add_executable(righttoleftexample qt_add_qml_module(righttoleftexample URI righttoleft - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "layoutdirection/layoutdirection.qml" diff --git a/examples/quick/scenegraph/customgeometry/CMakeLists.txt b/examples/quick/scenegraph/customgeometry/CMakeLists.txt index e1ee8b248f..5662266f41 100644 --- a/examples/quick/scenegraph/customgeometry/CMakeLists.txt +++ b/examples/quick/scenegraph/customgeometry/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(customgeometry_declarative PRIVATE qt_add_qml_module(customgeometry_declarative URI CustomGeometry - VERSION 1.0 QML_FILES main.qml RESOURCE_PREFIX /scenegraph/customgeometry NO_RESOURCE_TARGET_PATH diff --git a/examples/quick/scenegraph/custommaterial/CMakeLists.txt b/examples/quick/scenegraph/custommaterial/CMakeLists.txt index 130287b213..eacdd80642 100644 --- a/examples/quick/scenegraph/custommaterial/CMakeLists.txt +++ b/examples/quick/scenegraph/custommaterial/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(custommaterial_declarative PRIVATE qt_add_qml_module(custommaterial_declarative URI ExampleCustomMaterial - VERSION 1.0 QML_FILES main.qml RESOURCE_PREFIX /scenegraph/custommaterial diff --git a/examples/quick/scenegraph/customrendernode/CMakeLists.txt b/examples/quick/scenegraph/customrendernode/CMakeLists.txt index 2e2ba1316c..bff303029a 100644 --- a/examples/quick/scenegraph/customrendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/customrendernode/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(customrendernode PRIVATE qt_add_qml_module(customrendernode URI SceneGraphRendering - VERSION 1.0 QML_FILES main.qml RESOURCE_PREFIX /scenegraph/customrendernode diff --git a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt index da22717677..2a08c39d59 100644 --- a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt +++ b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt @@ -35,7 +35,6 @@ target_link_libraries(d3d11underqml PUBLIC qt_add_qml_module(d3d11underqml URI D3D11UnderQML - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt index 6c87bc6561..f3fbce11aa 100644 --- a/examples/quick/scenegraph/fboitem/CMakeLists.txt +++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(fboitem PRIVATE qt_add_qml_module(fboitem URI SceneGraphRendering - VERSION 1.0 QML_FILES main.qml RESOURCES shaders/checker.frag.qsb RESOURCE_PREFIX /scenegraph/fboitem diff --git a/examples/quick/scenegraph/graph/CMakeLists.txt b/examples/quick/scenegraph/graph/CMakeLists.txt index fe840c1251..fee1e498d7 100644 --- a/examples/quick/scenegraph/graph/CMakeLists.txt +++ b/examples/quick/scenegraph/graph/CMakeLists.txt @@ -35,7 +35,6 @@ target_link_libraries(graph PRIVATE qt_add_qml_module(graph URI Graph - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index cd65dba8ce..70cb10dc6a 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -43,7 +43,6 @@ endif() qt_add_qml_module(metaltextureimport URI MetalTextureImport - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt index ab841407ba..9bd54c637e 100644 --- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt @@ -40,7 +40,6 @@ endif() qt_add_qml_module(metalunderqml URI MetalUnderQML - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt index cac97aff62..cd64bb6172 100644 --- a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(openglunderqml PRIVATE qt_add_qml_module(openglunderqml URI OpenGLUnderQML - VERSION 1.0 QML_FILES main.qml RESOURCE_PREFIX /scenegraph/openglunderqml NO_RESOURCE_TARGET_PATH diff --git a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt index 9a429dc23c..a0e98f5e99 100644 --- a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt +++ b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(threadedanimation PRIVATE qt_add_qml_module(threadedanimation URI Spinner - VERSION 1.0 QML_FILES main.qml RESOURCES spinner.png RESOURCE_PREFIX /scenegraph/threadedanimation diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt index 28175248ec..153b9d123b 100644 --- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt +++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(twotextureproviders PRIVATE qt_add_qml_module(twotextureproviders URI SceneGraphRendering - VERSION 1.0 QML_FILES main.qml RESOURCE_PREFIX /scenegraph/twotextureproviders diff --git a/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt b/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt index 3f7b5e3b60..246fb2d6d2 100644 --- a/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkantextureimport/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(vulkantextureimport PRIVATE qt_add_qml_module(vulkantextureimport URI VulkanTextureImport - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt index 38bb243eb4..79cbc60477 100644 --- a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(vulkanunderqml PRIVATE qt_add_qml_module(vulkanunderqml URI VulkanUnderQML - VERSION 1.0 QML_FILES main.qml RESOURCES diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt index 883352e54a..3441dfaa1c 100644 --- a/examples/quick/shadereffects/CMakeLists.txt +++ b/examples/quick/shadereffects/CMakeLists.txt @@ -29,7 +29,6 @@ target_link_libraries(shadereffectsexample PRIVATE qt_add_qml_module(shadereffectsexample URI shadereffects - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "shadereffects.qml" diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt index 5c6348ab04..40fd459bf0 100644 --- a/examples/quick/shapes/CMakeLists.txt +++ b/examples/quick/shapes/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(shapesexample shapes_shared) qt_add_qml_module(shapesexample URI shapes - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "clippedtigers.qml" diff --git a/examples/quick/tableview/gameoflife/CMakeLists.txt b/examples/quick/tableview/gameoflife/CMakeLists.txt index dcda42e397..8195fba9f6 100644 --- a/examples/quick/tableview/gameoflife/CMakeLists.txt +++ b/examples/quick/tableview/gameoflife/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(gameoflife PUBLIC qt_add_qml_module(gameoflife URI GameOfLifeModel - VERSION 1.0 QML_FILES main.qml RESOURCES gosperglidergun.cells NO_RESOURCE_TARGET_PATH diff --git a/examples/quick/tableview/pixelator/CMakeLists.txt b/examples/quick/tableview/pixelator/CMakeLists.txt index 2cb4309836..6de15b8615 100644 --- a/examples/quick/tableview/pixelator/CMakeLists.txt +++ b/examples/quick/tableview/pixelator/CMakeLists.txt @@ -33,7 +33,6 @@ target_link_libraries(qml_pixelator PUBLIC qt_add_qml_module(qml_pixelator URI ImageModel - VERSION 1.0 QML_FILES main.qml RESOURCES qt.png NO_RESOURCE_TARGET_PATH diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt index 4050357c70..31076c5339 100644 --- a/examples/quick/text/CMakeLists.txt +++ b/examples/quick/text/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(textexample text_shared) qt_add_qml_module(textexample URI text - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "fonts/availableFonts.qml" diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt index 9b60123d47..0eb73afc76 100644 --- a/examples/quick/threading/CMakeLists.txt +++ b/examples/quick/threading/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(threadingexample threading_shared) qt_add_qml_module(threadingexample URI threading - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "threadedlistmodel/dataloader.mjs" diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt index 942d81a10d..3a0ced72f9 100644 --- a/examples/quick/touchinteraction/CMakeLists.txt +++ b/examples/quick/touchinteraction/CMakeLists.txt @@ -33,7 +33,6 @@ add_dependencies(touchinteractionexample touchinteraction_shared) qt_add_qml_module(touchinteractionexample URI touchinteraction - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "flickable/Panel.qml" diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt index 34666139ae..4cc0d60742 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(dynamicview1 PROPERTIES qt_add_qml_module(dynamicview1 URI dynamicview - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt index 9246e13129..6db9439a77 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(dynamicview2 PROPERTIES qt_add_qml_module(dynamicview2 URI dynamicview - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt index 41f5fd2ff4..6b7a4b1605 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(dynamicview3 PROPERTIES qt_add_qml_module(dynamicview3 URI dynamicview - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt index 3f0fe1aaac..aff35996da 100644 --- a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt +++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(dynamicview4 PROPERTIES qt_add_qml_module(dynamicview4 URI dynamicview - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES dynamicview.qml diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt index ba307f3c79..8cc399ccd0 100644 --- a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(samegame1 PROPERTIES qt_add_qml_module(samegame1 URI samegame - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt index 49927d36ec..1233e4d407 100644 --- a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(samegame2 PROPERTIES qt_add_qml_module(samegame2 URI samegame - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt index b73ff9fd61..59fa1302a6 100644 --- a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(samegame3 PROPERTIES qt_add_qml_module(samegame3 URI samegame - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "Block.qml" diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt index de045db8f1..77fdb83718 100644 --- a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt +++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt @@ -25,7 +25,6 @@ set_target_properties(samegame4 PROPERTIES qt_add_qml_module(samegame4 URI samegame - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "BoomBlock.qml" diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt index 2c143e8be2..0eadd33a5a 100644 --- a/examples/quick/views/CMakeLists.txt +++ b/examples/quick/views/CMakeLists.txt @@ -36,7 +36,6 @@ add_dependencies(viewsexample views_shared) qt_add_qml_module(viewsexample URI views - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "delegatemodel/dragselection.qml" diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt index 294fd9cd53..31932654ea 100644 --- a/examples/quick/window/CMakeLists.txt +++ b/examples/quick/window/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(windowexample PRIVATE qt_add_qml_module(windowexample URI window - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "AllScreens.qml" diff --git a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt index 8915937222..4228052a26 100644 --- a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_executable(attachedstylepropertiesexample qt_add_qml_module(attachedstylepropertiesexample URI App - VERSION 1.0 QML_FILES attachedstyleproperties.qml NO_RESOURCE_TARGET_PATH diff --git a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt index 2ac65d3f57..e6e6e10370 100644 --- a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt @@ -6,7 +6,6 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproper qt_add_qml_module(MyStyle URI MyStyle - VERSION 1.0 IMPORTS QtQuick.Controls.Material QML_FILES diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt index e75da2d2ef..52a9dcb19b 100644 --- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(chattutorial-chapter1 PRIVATE qt_add_qml_module(chattutorial-chapter1 URI chapter1 - VERSION 1.0 QML_FILES "main.qml" ) diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt index 4bf3e834cd..0669626a06 100644 --- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(chattutorial-chapter2 PRIVATE qt_add_qml_module(chattutorial-chapter2 URI chapter2 - VERSION 1.0 QML_FILES "main.qml" RESOURCES diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt index d46fd3455d..e55597f2c8 100644 --- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(chattutorial-chapter3 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter3 URI chapter3 - VERSION 1.0 QML_FILES "ContactPage.qml" "ConversationPage.qml" diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt index cf6985cfe8..c26fe1416b 100644 --- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(chattutorial-chapter4 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter4 URI chapter4 - VERSION 1.0 QML_FILES "ContactPage.qml" "ConversationPage.qml" diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt index 0e72bc31f1..39126e51bd 100644 --- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(chattutorial-chapter5 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter5 URI chapter5 - VERSION 1.0 QML_FILES "+Material/ChatToolBar.qml" "ChatToolBar.qml" diff --git a/examples/quickcontrols/contactlist/CMakeLists.txt b/examples/quickcontrols/contactlist/CMakeLists.txt index b9ca81a90d..d353e3374f 100644 --- a/examples/quickcontrols/contactlist/CMakeLists.txt +++ b/examples/quickcontrols/contactlist/CMakeLists.txt @@ -21,7 +21,6 @@ qt_add_executable(contactlistexample WIN32 MACOSX_BUNDLE qt_add_qml_module(contactlistexample URI contactlist - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "ContactDelegate.ui.qml" diff --git a/examples/quickcontrols/eventcalendar/CMakeLists.txt b/examples/quickcontrols/eventcalendar/CMakeLists.txt index dc2657eea8..92299b1870 100644 --- a/examples/quickcontrols/eventcalendar/CMakeLists.txt +++ b/examples/quickcontrols/eventcalendar/CMakeLists.txt @@ -35,7 +35,6 @@ target_link_libraries(eventcalendar PUBLIC qt_add_qml_module(eventcalendar URI App - VERSION 1.0 QML_FILES MonthGridDelegate.qml eventcalendar.qml diff --git a/examples/quickcontrols/flatstyle/CMakeLists.txt b/examples/quickcontrols/flatstyle/CMakeLists.txt index b8de1b7adb..c505c03bca 100644 --- a/examples/quickcontrols/flatstyle/CMakeLists.txt +++ b/examples/quickcontrols/flatstyle/CMakeLists.txt @@ -20,7 +20,6 @@ qt_add_executable(flatstyleexample WIN32 MACOSX_BUNDLE qt_add_qml_module(flatstyleexample URI flatstyle - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "MainForm.ui.qml" diff --git a/examples/quickcontrols/gallery/CMakeLists.txt b/examples/quickcontrols/gallery/CMakeLists.txt index 85d8189f9c..baa7d948f1 100644 --- a/examples/quickcontrols/gallery/CMakeLists.txt +++ b/examples/quickcontrols/gallery/CMakeLists.txt @@ -20,7 +20,6 @@ qt_add_executable(galleryexample WIN32 MACOSX_BUNDLE qt_add_qml_module(galleryexample URI gallery - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "+Material/ToolBar.qml" diff --git a/examples/quickcontrols/imagine/automotive/CMakeLists.txt b/examples/quickcontrols/imagine/automotive/CMakeLists.txt index 6769057db7..94e79a10a8 100644 --- a/examples/quickcontrols/imagine/automotive/CMakeLists.txt +++ b/examples/quickcontrols/imagine/automotive/CMakeLists.txt @@ -20,7 +20,6 @@ qt_add_executable(automotiveexample WIN32 MACOSX_BUNDLE qt_add_qml_module(automotiveexample URI automotive - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "qml/FeatureButton.qml" diff --git a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt index 422319c1f5..cc3d5b27b0 100644 --- a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt +++ b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt @@ -20,7 +20,6 @@ qt_add_executable(musicplayerexample WIN32 MACOSX_BUNDLE qt_add_qml_module(musicplayerexample URI musicplayer - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "musicplayer.qml" diff --git a/examples/quickcontrols/ios/todolist/CMakeLists.txt b/examples/quickcontrols/ios/todolist/CMakeLists.txt index 413ea6ad97..ea96d606c7 100644 --- a/examples/quickcontrols/ios/todolist/CMakeLists.txt +++ b/examples/quickcontrols/ios/todolist/CMakeLists.txt @@ -38,7 +38,6 @@ set_source_files_properties(Database.qml PROPERTIES qt_add_qml_module(todolist URI App - VERSION 1.0 QML_FILES AppSettings.qml Database.qml diff --git a/examples/quickcontrols/sidepanel/CMakeLists.txt b/examples/quickcontrols/sidepanel/CMakeLists.txt index e8f01ad6dd..fa65ea1f11 100644 --- a/examples/quickcontrols/sidepanel/CMakeLists.txt +++ b/examples/quickcontrols/sidepanel/CMakeLists.txt @@ -20,7 +20,6 @@ qt_add_executable(sidepanelexample WIN32 MACOSX_BUNDLE qt_add_qml_module(sidepanelexample URI sidepanel - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "sidepanel.qml" diff --git a/examples/quickcontrols/swipetoremove/CMakeLists.txt b/examples/quickcontrols/swipetoremove/CMakeLists.txt index ae445cbb7c..4500695355 100644 --- a/examples/quickcontrols/swipetoremove/CMakeLists.txt +++ b/examples/quickcontrols/swipetoremove/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries(swipetoremoveexample PUBLIC # Resources: qt_add_qml_module(swipetoremoveexample URI swipetoremove - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "swipetoremove.qml" diff --git a/examples/quickcontrols/texteditor/CMakeLists.txt b/examples/quickcontrols/texteditor/CMakeLists.txt index 3c2a461b02..37c86142da 100644 --- a/examples/quickcontrols/texteditor/CMakeLists.txt +++ b/examples/quickcontrols/texteditor/CMakeLists.txt @@ -21,7 +21,6 @@ qt_add_executable(texteditorexample WIN32 MACOSX_BUNDLE qt_add_qml_module(texteditorexample URI texteditor - VERSION 1.0 NO_RESOURCE_TARGET_PATH QML_FILES "qml/+touch/texteditor.qml" diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index fce7156a55..ff84003599 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -122,16 +122,10 @@ function(qt6_add_qml_module target) endif() if (NOT arg_VERSION) - message(FATAL_ERROR - "Called without a module version. Please specify one using the VERSION argument." - ) - endif() - - if ("${arg_VERSION}" MATCHES "^([0-9]+\\.[0-9]+)\\.[0-9]+$") + set(arg_VERSION "254.254") + elseif ("${arg_VERSION}" MATCHES "^([0-9]+\\.[0-9]+)\\.[0-9]+$") set(arg_VERSION "${CMAKE_MATCH_1}") - endif() - - if (NOT "${arg_VERSION}" MATCHES "^[0-9]+\\.[0-9]+$") + elseif (NOT "${arg_VERSION}" MATCHES "^[0-9]+\\.[0-9]+$") message(FATAL_ERROR "Called with an invalid version argument: '${arg_VERSION}'. " "Expected version in the form: VersionMajor.VersionMinor." diff --git a/src/qml/doc/snippets/qmltc/CMakeLists.txt b/src/qml/doc/snippets/qmltc/CMakeLists.txt index b6f24e8684..4be5a96528 100644 --- a/src/qml/doc/snippets/qmltc/CMakeLists.txt +++ b/src/qml/doc/snippets/qmltc/CMakeLists.txt @@ -45,7 +45,6 @@ target_compile_definitions(${application_name} PRIVATE #! [qmltc-add-qml-module] # Make the application into a proper QML module: qt6_add_qml_module(${application_name} - VERSION 1.0 URI QmltcExample AUTO_RESOURCE_PREFIX QML_FILES ${application_qml_files} diff --git a/src/qml/doc/snippets/qmltc/myApp.qml b/src/qml/doc/snippets/qmltc/myApp.qml index f4f9aa2f78..5fef927210 100644 --- a/src/qml/doc/snippets/qmltc/myApp.qml +++ b/src/qml/doc/snippets/qmltc/myApp.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QmltcExample 1.0 // application's own QML module +import QmltcExample // application's own QML module Rectangle { id: window diff --git a/src/qml/doc/src/cmake/qt_add_qml_module.qdoc b/src/qml/doc/src/cmake/qt_add_qml_module.qdoc index fc0ad59d51..e12b3a6f24 100644 --- a/src/qml/doc/src/cmake/qt_add_qml_module.qdoc +++ b/src/qml/doc/src/cmake/qt_add_qml_module.qdoc @@ -18,7 +18,7 @@ qt_add_qml_module( target URI uri - VERSION version + [VERSION version] [PAST_MAJOR_VERSIONS ...] [STATIC | SHARED] [PLUGIN_TARGET plugin_target] @@ -363,7 +363,9 @@ alphanumeric or dot characters. Other QML modules may use this name in \l{Module Definition qmldir Files}{qmldir} file. The \c URI is also used to form the \e{target path} by replacing dots with forward slashes. -A QML module must also define a \c VERSION in the form \c{Major.Minor}, where +\section2 Versions + +A QML module can also define a \c VERSION in the form \c{Major.Minor}, where both \c Major and \c Minor must be integers. An additional \c{.Patch} component may be appended, but will be ignored. A list of earlier major versions the module provides types for can also optionally be given after the @@ -373,6 +375,11 @@ in-depth discussion of the module URI and version numbering, \l{Registering past major versions} for registering past major versions, and \l{Keeping module versions in sync} for keeping module versions in sync. +If you don't need versions you should omit the \c VERSION argument. It defaults +to the highest possible version. Internal versioning of QML modules has some +fundamental flaws. You should use an external package management mechanism to +manage different versions of your QML modules. + \section2 Adding sources and resources to the module \c SOURCES specifies a list of non-QML sources to be added to the backing diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index 33f00d9eea..0b60a0092b 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -18,7 +18,6 @@ qt_autogen_tools_initial_setup(testCppTypes) target_link_libraries(testCppTypes PRIVATE Qt::Qml Qt::QmlPrivate Qt::Quick) qt6_add_qml_module(testCppTypes - VERSION 1.0 URI TestTypes SOURCES commontypes.h diff --git a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt index e6842b995d..b95067de6b 100644 --- a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt +++ b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt @@ -10,7 +10,6 @@ qt_autogen_tools_initial_setup(additional_qml_module_plugin) qt6_add_qml_module(additional_qml_module PLUGIN_TARGET additional_qml_module_plugin CLASS_NAME "BasicExtension" - VERSION 1.0 URI "BasicExtension" RESOURCE_PREFIX "/" QML_FILES diff --git a/tests/auto/qml/qmlbasicapp/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/CMakeLists.txt index 444009cdf4..8328a6b3f4 100644 --- a/tests/auto/qml/qmlbasicapp/CMakeLists.txt +++ b/tests/auto/qml/qmlbasicapp/CMakeLists.txt @@ -10,7 +10,6 @@ qt_internal_add_test(tst_qmlbasicapp ) qt6_add_qml_module(tst_qmlbasicapp - VERSION 1.0 URI "BasicApp" RESOURCE_PREFIX "/" QML_FILES diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt index 1d68030dc4..8bb316fa24 100644 --- a/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt +++ b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt @@ -4,7 +4,6 @@ qt6_add_library(qmlqtimeexample2 STATIC) qt_autogen_tools_initial_setup(qmlqtimeexample2) qt6_add_qml_module(qmlqtimeexample2 - VERSION 1.0 URI "TimeExample2" RESOURCE_PREFIX "/" SOURCES diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp index 6d61d4d7a3..fd72a0910f 100644 --- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp +++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp @@ -110,7 +110,7 @@ void tst_basicapp::qmldirContents() QVERIFY(contents.contains("typeinfo")); QVERIFY(contents.contains("depends QtQml")); QVERIFY(contents.contains("prefer :/TimeExample2/")); - QVERIFY(contents.contains("Clock 1.0 Clock.qml")); + QVERIFY(contents.contains("Clock 254.0 Clock.qml")); QFile qmldirInResources(":/TimeExample2/qmldir"); QVERIFY(qmldirInResources.open(QIODevice::ReadOnly)); @@ -121,7 +121,7 @@ void tst_basicapp::qmldirContents() QFile qmldir(basedir + "/BasicExtension/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); - QVERIFY(contents.contains("More 1.0 More.ui.qml")); + QVERIFY(contents.contains("More 254.0 More.ui.qml")); QVERIFY(contents.contains("Less.js")); QVERIFY(contents.contains("ESModule.mjs")); QVERIFY(!contents.contains("lowerCase.js")); diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index 1ba544f143..d92d5e6166 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -27,7 +27,6 @@ qt_internal_add_test(tst_qmlcachegen qt6_add_qml_module(tst_qmlcachegen URI cachegentest - VERSION 1.0 RESOURCE_PREFIX "/" ) diff --git a/tests/auto/qml/qmlsplitlib/CMakeLists.txt b/tests/auto/qml/qmlsplitlib/CMakeLists.txt index 1e67c141d2..523ab5cbfd 100644 --- a/tests/auto/qml/qmlsplitlib/CMakeLists.txt +++ b/tests/auto/qml/qmlsplitlib/CMakeLists.txt @@ -25,7 +25,6 @@ qt_autogen_tools_initial_setup(tst_qmlsplitlib) qt6_generate_foreign_qml_types(tst_qmlsplitlib_library tst_qmlsplitlib) qt6_add_qml_module(tst_qmlsplitlib - VERSION 1.0 URI "SplitLib" AUTO_RESOURCE_PREFIX QML_FILES diff --git a/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt b/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt index a93698655c..f661cdea1e 100644 --- a/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt +++ b/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt @@ -25,7 +25,6 @@ qt_autogen_tools_initial_setup(qmltc_namespace_test_module) target_link_libraries(qmltc_namespace_test_module PUBLIC ${common_libraries}) qt6_add_qml_module(qmltc_namespace_test_module - VERSION 1.0 URI NamespaceTest.Subfolder AUTO_RESOURCE_PREFIX SOURCES diff --git a/tests/auto/qml/qmltc_manual/CMakeLists.txt b/tests/auto/qml/qmltc_manual/CMakeLists.txt index c7b7ebb83b..8101bcbcea 100644 --- a/tests/auto/qml/qmltc_manual/CMakeLists.txt +++ b/tests/auto/qml/qmltc_manual/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_test(tst_qmltc_manual ) qt6_add_qml_module(tst_qmltc_manual - VERSION 1.0 URI "QmltcManualTests" AUTO_RESOURCE_PREFIX QML_FILES diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index b570a6e6db..039f1647db 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -78,7 +78,6 @@ target_link_libraries(tst-qmltyperegistrar-with-dashes PRIVATE Qt::Core Qt::Qml) qt_enable_autogen_tool(tst-qmltyperegistrar-with-dashes "moc" ON) qt_add_qml_module(tst-qmltyperegistrar-with-dashes URI Module-With-Dashes - VERSION 1.0 AUTO_RESOURCE_PREFIX SOURCES foo.cpp foo.h diff --git a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt index 21cf8b4b56..cb020e95e0 100644 --- a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt @@ -5,7 +5,6 @@ qt_add_qml_module(UnregisteredTypes STATIC URI UnregisteredTypes - VERSION 1.0 NO_GENERATE_QMLTYPES NO_PLUGIN SOURCES uncreatable.h diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index 422a8aa580..e68b7f9a48 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -39,7 +39,6 @@ endif() qt_add_qml_module( tst_qqmlcomponent URI test - VERSION 1.0 AUTO_RESOURCE_PREFIX QML_FILES "data/TestComponentWithIC.qml" diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt index 9e80fa36c0..0869fe7ccc 100644 --- a/tests/auto/qml/qqmlengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlengine/CMakeLists.txt @@ -31,7 +31,6 @@ qt_add_library(tst_qqmlengine_qml STATIC) qt_autogen_tools_initial_setup(tst_qqmlengine_qml) qt_add_qml_module(tst_qqmlengine_qml URI OnlyDeclarative - VERSION 1.0 SOURCES "declarativelyregistered.h" "declarativelyregistered.cpp" diff --git a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt index 9cbb418d22..3431398f47 100644 --- a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt +++ b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt @@ -9,7 +9,6 @@ target_include_directories(qqmljsscope_test_module PUBLIC cpptypes/) target_link_libraries(qqmljsscope_test_module PUBLIC Qt::Core Qt::Qml Qt::Gui) qt6_add_qml_module(qqmljsscope_test_module - VERSION 1.0 URI QQmlJSScopeTests AUTO_RESOURCE_PREFIX SOURCES diff --git a/tests/auto/qml/qqmljsscope/data/extensions.qml b/tests/auto/qml/qqmljsscope/data/extensions.qml index 60bd4143f4..092d05d114 100644 --- a/tests/auto/qml/qqmljsscope/data/extensions.qml +++ b/tests/auto/qml/qqmljsscope/data/extensions.qml @@ -1,5 +1,5 @@ import QtQuick -import QQmlJSScopeTests 1.0 +import QQmlJSScopeTests Item { Extended { } diff --git a/tests/auto/qml/qqmljsscope/data/functionAndBindingIndices.qml b/tests/auto/qml/qqmljsscope/data/functionAndBindingIndices.qml index d6f5d39d76..5a8442d6f5 100644 --- a/tests/auto/qml/qqmljsscope/data/functionAndBindingIndices.qml +++ b/tests/auto/qml/qqmljsscope/data/functionAndBindingIndices.qml @@ -1,6 +1,6 @@ import QtQml import QtQuick -import QQmlJSScopeTests 1.0 +import QQmlJSScopeTests Text { id: root diff --git a/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt b/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt index 53140fee97..8f918dd753 100644 --- a/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt +++ b/tests/auto/quick/qquickitemrhiintegration/CMakeLists.txt @@ -42,6 +42,5 @@ qt_internal_add_shaders(tst_qquickitemrhiintegration "shaders" qt_add_qml_module(tst_qquickitemrhiintegration URI TestQquickitemrhiintegration - VERSION 1.0 AUTO_RESOURCE_PREFIX ) diff --git a/tests/auto/quick/qquicklistview2/CMakeLists.txt b/tests/auto/quick/qquicklistview2/CMakeLists.txt index 17f1956c8e..6af00b60e8 100644 --- a/tests/auto/quick/qquicklistview2/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview2/CMakeLists.txt @@ -25,7 +25,6 @@ qt_internal_add_test(tst_qquicklistview2 qt6_add_qml_module(tst_qquicklistview2 URI Test - VERSION 1.0 AUTO_RESOURCE_PREFIX ) -- cgit v1.2.3