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/tutorials/extending-qml/chapter1-basics/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt | 1 - .../qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt | 1 - .../qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt | 1 - 7 files changed, 7 deletions(-) (limited to 'examples/qml/tutorials/extending-qml') 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 -- cgit v1.2.3