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.

4 files changed, 181 insertions, 0 deletions

diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 172146c..1b35442 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -8,6 +8,7 @@ SOURCES += \
     $$PWD/qmlexpression.cpp \
     $$PWD/qmlbinding.cpp \
     $$PWD/qmlmetaproperty.cpp \
+    $$PWD/qmlmoduleplugin.cpp \
     $$PWD/qmlcomponent.cpp \
     $$PWD/qmlcontext.cpp \
     $$PWD/qmlcustomparser.cpp \
@@ -62,6 +63,7 @@ HEADERS += \
     $$PWD/qmlbinding.h \
     $$PWD/qmlbinding_p.h \
     $$PWD/qmlmetaproperty.h \
+    $$PWD/qmlmoduleplugin.h \
     $$PWD/qmlcomponent.h \
     $$PWD/qmlcomponent_p.h \
     $$PWD/qmlcustomparser_p.h \
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;
             }
diff --git a/src/declarative/qml/qmlmoduleplugin.cpp b/src/declarative/qml/qmlmoduleplugin.cpp
new file mode 100644
index 0000000..446c7bc
--- /dev/null
+++ b/src/declarative/qml/qmlmoduleplugin.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmlmoduleplugin.h"
+#include "qstringlist.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QmlModulePlugin
+    \brief The QmlModulePlugin class provides an abstract base for custom QML module plugins.
+    \reentrant
+    \ingroup plugins
+
+    The QML module plugin is a simple plugin interface that makes it
+    easy to add custom QML modules that can be loaded dynamically
+    into applications.
+
+    Writing a QML module plugin is achieved by subclassing this base
+    class, reimplementing the pure virtual function keys(), and
+    exporting the class with the Q_EXPORT_PLUGIN2() macro. See \l{How
+    to Create Qt Plugins} for details.
+
+    The plugin should register QML types with QML_DEFINE_TYPE.
+
+    The strings returned by keys() should be the list of URIs of module
+    that the plugin registers.
+
+    \sa examples/declarative/plugins
+*/
+
+/*!
+    Constructs a QML module plugin with the given \a parent. This is
+    invoked automatically by the Q_EXPORT_PLUGIN2() macro.
+*/
+QmlModulePlugin::QmlModulePlugin(QObject *parent)
+    : QObject(parent)
+{
+}
+
+/*!
+    Destroys the QML module plugin.
+
+    You never have to call this explicitly. Qt destroys a plugin
+    automatically when it is no longer used.
+*/
+QmlModulePlugin::~QmlModulePlugin()
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlmoduleplugin.h b/src/declarative/qml/qmlmoduleplugin.h
new file mode 100644
index 0000000..315209d
--- /dev/null
+++ b/src/declarative/qml/qmlmoduleplugin.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLMODULEPLUGIN_H
+#define QMLMODULEPLUGIN_H
+
+#include <QtCore/qplugin.h>
+#include <QtCore/qfactoryinterface.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qbytearray.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+struct Q_DECLARATIVE_EXPORT QmlModuleFactoryInterface : public QFactoryInterface
+{
+};
+
+#define QmlModuleFactoryInterface_iid "com.nokia.Qt.QmlModuleFactoryInterface"
+
+Q_DECLARE_INTERFACE(QmlModuleFactoryInterface, QmlModuleFactoryInterface_iid)
+
+
+class Q_DECLARATIVE_EXPORT QmlModulePlugin : public QObject, public QmlModuleFactoryInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QmlModuleFactoryInterface:QFactoryInterface)
+public:
+    explicit QmlModulePlugin(QObject *parent = 0);
+    ~QmlModulePlugin();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMLMODULEPLUGIN_H