diff options
| author | Ulf Hermann <[email protected]> | 2022-06-10 15:51:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2023-01-27 19:16:39 +0100 |
| commit | 2d44365f69b9bc946d085c6b149e2ac319700265 (patch) | |
| tree | 966cc5dcab9ef9bc3f9ab255b602bf624b692bd0 /tests/auto/qml/qmlbasicapp | |
| parent | d34d035022f9c7b9957cfb2abe0ba90486416ae2 (diff) | |
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 <[email protected]>
Reviewed-by: Alexey Edelev <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Sami Shalayel <[email protected]>
Diffstat (limited to 'tests/auto/qml/qmlbasicapp')
4 files changed, 2 insertions, 5 deletions
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")); |