Add support for implicit module imports

This allows a module to make another module import with the same minor
version and in the same qualified namespace. This will be used to make
import QtQuick 2.5 implicitly import QtQml 2.5, to maintain compatibility.
It used to be implemented by means of calling C++ type registration functions
directly.

Change-Id: I64c7bfe25d75b9a45f5d44a10d035fc2f86d30ca
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 43 insertions, 0 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index a1bf9e9201..3a18bbf7c9 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -517,6 +517,9 @@ bool QQmlTypeLoader::Blob::updateQmldir(const QQmlRefPointer<QQmlQmldirData> &da
     if (!m_importCache.updateQmldirContent(typeLoader()->importDatabase(), import->uri, import->qualifier, qmldirIdentifier, qmldirUrl, errors))
         return false;
 
+    if (!loadImportDependencies(import, qmldirIdentifier, errors))
+        return false;
+
     import->priority = data->priority(this);
 
     // Release this reference at destruction
@@ -573,6 +576,9 @@ bool QQmlTypeLoader::Blob::addImport(QQmlTypeLoader::Blob::PendingImportPtr impo
                                           import->minorVersion, qmldirFilePath, qmldirUrl, false, errors))
                 return false;
 
+            if (!loadImportDependencies(import, qmldirFilePath, errors))
+                return false;
+
             if (!import->qualifier.isEmpty()) {
                 // Does this library contain any qualified scripts?
                 QUrl libraryUrl(qmldirUrl);
@@ -677,6 +683,21 @@ void QQmlTypeLoader::Blob::dependencyComplete(QQmlDataBlob *blob)
     }
 }
 
+bool QQmlTypeLoader::Blob::loadImportDependencies(PendingImportPtr currentImport, const QString &qmldirUri, QList<QQmlError> *errors)
+{
+    const QQmlTypeLoaderQmldirContent qmldir = typeLoader()->qmldirContent(qmldirUri);
+    for (const QString &implicitImports: qmldir.imports()) {
+        auto dependencyImport = std::make_shared<PendingImport>();
+        dependencyImport->uri = implicitImports;
+        dependencyImport->qualifier = currentImport->qualifier;
+        dependencyImport->majorVersion = currentImport->majorVersion;
+        dependencyImport->minorVersion = currentImport->minorVersion;
+        if (!addImport(dependencyImport, errors))
+            return false;
+    }
+    return true;
+}
+
 bool QQmlTypeLoader::Blob::isDebugging() const
 {
     return typeLoader()->engine()->handle()->debugger() != nullptr;
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index f8cec700a5..612d6777ed 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -122,6 +122,8 @@ public:
 
         void dependencyComplete(QQmlDataBlob *) override;
 
+        bool loadImportDependencies(PendingImportPtr currentImport, const QString &qmldirUri, QList<QQmlError> *errors);
+
     protected:
         virtual QString stringAt(int) const { return QString(); }
 
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent.cpp b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
index 4aaa60f496..238af9b710 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent.cpp
+++ b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
@@ -102,6 +102,11 @@ QQmlDirPlugins QQmlTypeLoaderQmldirContent::plugins() const
     return m_parser.plugins();
 }
 
+QStringList QQmlTypeLoaderQmldirContent::imports() const
+{
+    return m_parser.imports();
+}
+
 QString QQmlTypeLoaderQmldirContent::pluginLocation() const
 {
     return m_location;
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent_p.h b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
index 9e0a80cea8..698643c7ec 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent_p.h
+++ b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
@@ -78,6 +78,7 @@ public:
     QQmlDirComponents components() const;
     QQmlDirScripts scripts() const;
     QQmlDirPlugins plugins() const;
+    QStringList imports() const;
 
     QString pluginLocation() const;
 
diff --git a/src/qml/qmldirparser/qqmldirparser.cpp b/src/qml/qmldirparser/qqmldirparser.cpp
index d7662b11f5..5bf33d3602 100644
--- a/src/qml/qmldirparser/qqmldirparser.cpp
+++ b/src/qml/qmldirparser/qqmldirparser.cpp
@@ -262,6 +262,13 @@ bool QQmlDirParser::parse(const QString &source)
             } else {
                 reportError(lineNumber, 0, QStringLiteral("invalid version %1, expected <major>.<minor>").arg(sections[2]));
             }
+        } else if (sections[0] == QLatin1String("import")) {
+            if (sectionCount != 2) {
+                reportError(lineNumber, 0,
+                            QStringLiteral("import requires 2 arguments, but %1 were provided").arg(sectionCount - 1));
+                continue;
+            }
+            _imports << sections[1];
         } else if (sectionCount == 2) {
             // No version specified (should only be used for relative qmldir files)
             const Component entry(sections[0], sections[1], -1, -1);
@@ -354,6 +361,11 @@ QHash<QString, QQmlDirParser::Component> QQmlDirParser::dependencies() const
     return _dependencies;
 }
 
+QStringList QQmlDirParser::imports() const
+{
+    return _imports;
+}
+
 QList<QQmlDirParser::Script> QQmlDirParser::scripts() const
 {
     return _scripts;
diff --git a/src/qml/qmldirparser/qqmldirparser_p.h b/src/qml/qmldirparser/qqmldirparser_p.h
index 20b92ab3c6..37ca1ef2ce 100644
--- a/src/qml/qmldirparser/qqmldirparser_p.h
+++ b/src/qml/qmldirparser/qqmldirparser_p.h
@@ -136,6 +136,7 @@ public:
 
     QHash<QString,Component> components() const;
     QHash<QString,Component> dependencies() const;
+    QStringList imports() const;
     QList<Script> scripts() const;
     QList<Plugin> plugins() const;
     bool designerSupported() const;
@@ -162,6 +163,7 @@ private:
     QString _typeNamespace;
     QHash<QString,Component> _components; // multi hash
     QHash<QString,Component> _dependencies;
+    QStringList _imports;
     QList<Script> _scripts;
     QList<Plugin> _plugins;
     bool _designerSupported;