diff options
Diffstat (limited to 'tests/auto/qml')
16 files changed, 4 insertions, 17 deletions
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 |