diff options
Diffstat (limited to 'tests/auto/qml/qmlimportscanner/data')
20 files changed, 496 insertions, 83 deletions
diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json index 3283b0d036..028685f566 100644 --- a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json +++ b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json @@ -6,31 +6,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json b/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json index 13ed122797..77faf99e6c 100644 --- a/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json +++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json @@ -5,25 +5,47 @@ "type": "module" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json b/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json index 1020588e20..cf446c33bd 100644 --- a/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json +++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json @@ -6,31 +6,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json b/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json index 3bbbb1a130..0a885f058e 100644 --- a/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json @@ -1,23 +1,46 @@ [ { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/Imports.json b/tests/auto/qml/qmlimportscanner/data/Imports.json index 97f696cc08..20b9c524c4 100644 --- a/tests/auto/qml/qmlimportscanner/data/Imports.json +++ b/tests/auto/qml/qmlimportscanner/data/Imports.json @@ -6,31 +6,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json b/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json index 5debf07b8a..f07b7e8494 100644 --- a/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json @@ -2,9 +2,12 @@ { "classname": "QtQuick2Plugin", "name": "QtQuick", + "linkTarget": "Qt6::qtquick2plugin", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { "name": "Things", @@ -13,24 +16,47 @@ "type": "module" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json b/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json index 3d46f89a90..3aa7bc8282 100644 --- a/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json +++ b/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json @@ -1,30 +1,56 @@ [ { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/Simple.qml.json b/tests/auto/qml/qmlimportscanner/data/Simple.qml.json index 3d46f89a90..3aa7bc8282 100644 --- a/tests/auto/qml/qmlimportscanner/data/Simple.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/Simple.qml.json @@ -1,30 +1,56 @@ [ { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/Singleton.json b/tests/auto/qml/qmlimportscanner/data/Singleton.json index a285fdf250..90f0ff19ad 100644 --- a/tests/auto/qml/qmlimportscanner/data/Singleton.json +++ b/tests/auto/qml/qmlimportscanner/data/Singleton.json @@ -6,31 +6,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/Things.json b/tests/auto/qml/qmlimportscanner/data/Things.json index 68430d158e..7782dd7c5f 100644 --- a/tests/auto/qml/qmlimportscanner/data/Things.json +++ b/tests/auto/qml/qmlimportscanner/data/Things.json @@ -7,31 +7,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] - diff --git a/tests/auto/qml/qmlimportscanner/data/With/Module/A.qml b/tests/auto/qml/qmlimportscanner/data/With/Module/A.qml new file mode 100644 index 0000000000..8fc36a40da --- /dev/null +++ b/tests/auto/qml/qmlimportscanner/data/With/Module/A.qml @@ -0,0 +1,3 @@ +import QtQml + +QtObject {} diff --git a/tests/auto/qml/qmlimportscanner/data/With/Module/qmldir b/tests/auto/qml/qmlimportscanner/data/With/Module/qmldir new file mode 100644 index 0000000000..2338864432 --- /dev/null +++ b/tests/auto/qml/qmlimportscanner/data/With/Module/qmldir @@ -0,0 +1,3 @@ +module Module + +A 1.0 A.qml diff --git a/tests/auto/qml/qmlimportscanner/data/WithOut/Module/A.qml b/tests/auto/qml/qmlimportscanner/data/WithOut/Module/A.qml new file mode 100644 index 0000000000..8fc36a40da --- /dev/null +++ b/tests/auto/qml/qmlimportscanner/data/WithOut/Module/A.qml @@ -0,0 +1,3 @@ +import QtQml + +QtObject {} diff --git a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json index 48029ebf01..8fe2da0078 100644 --- a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json @@ -1,10 +1,23 @@ [ { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "name": "Methods.js", @@ -12,16 +25,26 @@ }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/localImport.qml.json b/tests/auto/qml/qmlimportscanner/data/localImport.qml.json index 1a1e096359..7782dd7c5f 100644 --- a/tests/auto/qml/qmlimportscanner/data/localImport.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/localImport.qml.json @@ -7,30 +7,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json b/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json index 3d46f89a90..3aa7bc8282 100644 --- a/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json @@ -1,30 +1,56 @@ [ { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json b/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json index 1a1e096359..7782dd7c5f 100644 --- a/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json @@ -7,30 +7,56 @@ }, { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/qmldirpref.qml b/tests/auto/qml/qmlimportscanner/data/qmldirpref.qml new file mode 100644 index 0000000000..d1b1e80329 --- /dev/null +++ b/tests/auto/qml/qmlimportscanner/data/qmldirpref.qml @@ -0,0 +1,3 @@ +import Module + +A {} diff --git a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json index 3bbbb1a130..0a885f058e 100644 --- a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json +++ b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json @@ -1,23 +1,46 @@ [ { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" } ] diff --git a/tests/auto/qml/qmlimportscanner/data/rootPath.json b/tests/auto/qml/qmlimportscanner/data/rootPath.json index 8947b44706..b468a8acb1 100644 --- a/tests/auto/qml/qmlimportscanner/data/rootPath.json +++ b/tests/auto/qml/qmlimportscanner/data/rootPath.json @@ -1,30 +1,56 @@ [ { "classname": "QtQuick2Plugin", + "linkTarget": "Qt6::qtquick2plugin", "name": "QtQuick", "plugin": "qtquick2plugin", + "pluginIsOptional": true, "relativePath": "QtQuick", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQuick/" }, { - "classname": "QtQmlPlugin", + "classname": "QtQmlMetaPlugin", + "linkTarget": "Qt6::QmlMeta", "name": "QtQml", - "plugin": "qmlplugin", + "plugin": "qmlmetaplugin", + "pluginIsOptional": true, "relativePath": "QtQml", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/" + }, + { + "classname": "QtQmlPlugin", + "linkTarget": "Qt6::qmlplugin", + "name": "QtQml.Base", + "plugin": "qmlplugin", + "pluginIsOptional": true, + "relativePath": "QtQml/Base", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Base/" }, { "classname": "QtQmlModelsPlugin", + "linkTarget": "Qt6::modelsplugin", "name": "QtQml.Models", "plugin": "modelsplugin", + "pluginIsOptional": true, "relativePath": "QtQml/Models", - "type": "module" + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/Models/" }, { "classname": "QtQmlWorkerScriptPlugin", + "linkTarget": "Qt6::workerscriptplugin", "name": "QtQml.WorkerScript", "plugin": "workerscriptplugin", + "pluginIsOptional": true, "relativePath": "QtQml/WorkerScript", + "type": "module", + "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/" + }, + { + "name": "QML", "type": "module" }, { @@ -49,6 +75,9 @@ "name": "Imports", "relativePath": "Imports", "type": "module" + }, + { + "name": "Module", + "type": "module" } ] - |