Add methods to programatically insert qmldir import statements

We need this for controls2 to select the style at runtime.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 49b3d7ad93..1b7993af61 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -712,14 +712,20 @@ 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()) {
+    const QQmlTypeModule *module = QQmlMetaType::typeModule(currentImport->uri,
+                                                            currentImport->version);
+    const QStringList implicitImports = module ? (module->imports() + qmldir.imports())
+                                               : qmldir.imports();
+    for (const QString &implicitImport : implicitImports) {
         auto dependencyImport = std::make_shared<PendingImport>();
-        dependencyImport->uri = implicitImports;
+        dependencyImport->uri = implicitImport;
         dependencyImport->qualifier = currentImport->qualifier;
         dependencyImport->version = currentImport->version;
         if (!addImport(dependencyImport, errors))
             return false;
     }
+
+
     return true;
 }