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 --- src/qml/doc/snippets/qmltc/CMakeLists.txt | 1 - src/qml/doc/snippets/qmltc/myApp.qml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/qml/doc/snippets') 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 -- cgit v1.2.3