QmlCompiler: Don't add imports with "as" to the context

That is wrong. The context does not contain such objects. Instead, mark
the names as namespaces in the imports by giving them an empty type.

Change-Id: Ie9d0bba592863878d2220cee59be369ba2534f17
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 3 insertions, 5 deletions

diff --git a/src/qmlcompiler/qqmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp
index 73bc63e0fa..5b693f5c72 100644
--- a/src/qmlcompiler/qqmljsimporter.cpp
+++ b/src/qmlcompiler/qqmljsimporter.cpp
@@ -209,6 +209,9 @@ void QQmlJSImporter::processImport(
         QQmlJSImporter::AvailableTypes *types,
         const QString &prefix)
 {
+    if (!prefix.isEmpty())
+        types->qmlNames.insert(prefix, {}); // Empty type means "this is the prefix"
+
     for (auto it = import.scripts.begin(); it != import.scripts.end(); ++it)
         types->qmlNames.insert(prefixedName(prefix, it.key()), it.value());
 
diff --git a/src/qmlcompiler/qqmljsimportvisitor.cpp b/src/qmlcompiler/qqmljsimportvisitor.cpp
index b0fe5dc1ba..96c5b3b369 100644
--- a/src/qmlcompiler/qqmljsimportvisitor.cpp
+++ b/src/qmlcompiler/qqmljsimportvisitor.cpp
@@ -324,11 +324,6 @@ bool QQmlJSImportVisitor::visit(QQmlJS::AST::UiImport *import)
     }
 
     QString path {};
-    if (!import->importId.isEmpty()) {
-        // TODO: do not put imported ids into the same space as qml IDs
-        const QString importId = import->importId.toString();
-        m_scopesById.insert(importId, m_rootScopeImports.value(importId));
-    }
     auto uri = import->importUri;
     while (uri) {
         path.append(uri->name);