Load qmlmodules plugins.

This allows projects which use the declarative module to add QML types
through C++ modules, such that qmlviewer (or any QML) can import those
types.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index d5e3884..c44f6b6 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -51,6 +51,7 @@
 #include "qmlexpression.h"
 #include "qmlcomponent.h"
 #include "qmlmetaproperty_p.h"
+#include "qmlmoduleplugin.h"
 #include "qmlbinding_p.h"
 #include "qmlvme_p.h"
 #include "qmlenginedebug_p.h"
@@ -88,6 +89,7 @@
 #include <QGraphicsObject>
 #include <QtCore/qcryptographichash.h>
 
+#include <private/qfactoryloader_p.h>
 #include <private/qobject_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
 
@@ -1153,6 +1155,9 @@ struct QmlEnginePrivate::ImportedNamespace {
     }
 };
 
+Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
+    (QmlModuleFactoryInterface_iid, QLatin1String("/qmlmodules")))
+
 class QmlImportsPrivate {
 public:
     QmlImportsPrivate() : ref(1)
@@ -1190,6 +1195,13 @@ public:
                 }
             }
             if (!found) {
+                if (uri != QLatin1String("Qt")) { // skip well-known, it's not in a plugin
+                    QFactoryLoader *l = loader();
+                    QmlModuleFactoryInterface *factory =
+                        qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
+                    // return value not used currently
+                }
+
                 // XXX assume it is a built-in type qualifier
                 isbuiltin = true;
             }