QtQml: Have QtQml.Base formally import QML

This way we don't have to register QtObject and Component twice.

The QML_NAMED_ELEMENT etc. will return when we make the builtins a
proper module. The imperative registration is a stop gap measure.

Task-number: QTBUG-101143
Change-Id: I726aa77156b31aa624ac44d30e180ace6cb9d790
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

16 files changed, 64 insertions, 0 deletions

diff --git a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
index a688511ed0..028685f566 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeSingleton.json
@@ -53,5 +53,9 @@
         "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 084e4354b3..77faf99e6c 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithEnum.json
@@ -43,5 +43,9 @@
         "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 c50fe5ab51..cf446c33bd 100644
--- a/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/CompositeWithinSingleton.json
@@ -53,5 +53,9 @@
         "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 447c664785..0a885f058e 100644
--- a/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/Drawer.qml.json
@@ -38,5 +38,9 @@
         "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 5e23e7b1ad..20b9c524c4 100644
--- a/tests/auto/qml/qmlimportscanner/data/Imports.json
+++ b/tests/auto/qml/qmlimportscanner/data/Imports.json
@@ -53,5 +53,9 @@
         "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 06df9295fe..f07b7e8494 100644
--- a/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/ListProperty.qml.json
@@ -54,5 +54,9 @@
         "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 213798d04d..3aa7bc8282 100644
--- a/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json
+++ b/tests/auto/qml/qmlimportscanner/data/QTBUG-45916.js.json
@@ -48,5 +48,9 @@
         "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 213798d04d..3aa7bc8282 100644
--- a/tests/auto/qml/qmlimportscanner/data/Simple.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/Simple.qml.json
@@ -48,5 +48,9 @@
         "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 cb24e57f60..90f0ff19ad 100644
--- a/tests/auto/qml/qmlimportscanner/data/Singleton.json
+++ b/tests/auto/qml/qmlimportscanner/data/Singleton.json
@@ -53,5 +53,9 @@
         "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 ee5caecfda..7782dd7c5f 100644
--- a/tests/auto/qml/qmlimportscanner/data/Things.json
+++ b/tests/auto/qml/qmlimportscanner/data/Things.json
@@ -54,5 +54,9 @@
         "relativePath": "QtQml/WorkerScript",
         "type": "module",
         "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/"
+    },
+    {
+        "name": "QML",
+        "type": "module"
     }
 ]
diff --git a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
index 2d2b602fb1..8fe2da0078 100644
--- a/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/javascriptMethods.qml.json
@@ -42,5 +42,9 @@
         "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 ee5caecfda..7782dd7c5f 100644
--- a/tests/auto/qml/qmlimportscanner/data/localImport.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/localImport.qml.json
@@ -54,5 +54,9 @@
         "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 213798d04d..3aa7bc8282 100644
--- a/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/parentEnum.qml.json
@@ -48,5 +48,9 @@
         "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 ee5caecfda..7782dd7c5f 100644
--- a/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/qmldirImportAndDepend.qml.json
@@ -54,5 +54,9 @@
         "relativePath": "QtQml/WorkerScript",
         "type": "module",
         "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/"
+    },
+    {
+        "name": "QML",
+        "type": "module"
     }
 ]
diff --git a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
index 447c664785..0a885f058e 100644
--- a/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
+++ b/tests/auto/qml/qmlimportscanner/data/qtQmlOnly.qml.json
@@ -38,5 +38,9 @@
         "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 942c8d6000..b468a8acb1 100644
--- a/tests/auto/qml/qmlimportscanner/data/rootPath.json
+++ b/tests/auto/qml/qmlimportscanner/data/rootPath.json
@@ -50,6 +50,10 @@
         "prefer": ":/qt-project.org/imports/QtQml/WorkerScript/"
     },
     {
+        "name": "QML",
+        "type": "module"
+    },
+    {
         "name": "QTBUG-45916.js",
         "type": "javascript"
     },