Make the base URL available to QQmlExtensionPlugin

This is for the benefit of any plugin which needs to interact with the QML
files or related assets which are also located in its import directory.

Change-Id: Id23ec279b4d017bd3f620c3a7916dac9f9ac29bc
Reviewed-by: Alan Alpert <aalpert@rim.com>

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index 53094db..d3abd84 100644 (file)
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -133,7 +133,8 @@ HEADERS += \
     $$PWD/qqmlconnections_p.h \
     $$PWD/qqmltimer_p.h \
     $$PWD/qqmlbind_p.h \
-    $$PWD/qqmlplatform_p.h
+    $$PWD/qqmlplatform_p.h \
+    $$PWD/qqmlextensionplugin_p.h
 
 
 include(parser/parser.pri)

diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp
index bbc0fed..edef5a9 100644 (file)
--- a/src/qml/qml/qqmlextensionplugin.cpp
+++ b/src/qml/qml/qqmlextensionplugin.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qqmlextensionplugin.h"
+#include "qqmlextensionplugin_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -144,7 +145,7 @@ QT_BEGIN_NAMESPACE
     explicitly.
 */
 QQmlExtensionPlugin::QQmlExtensionPlugin(QObject *parent)
-    : QObject(parent)
+    : QObject(*(new QQmlExtensionPluginPrivate), parent)
 {
 }
 
@@ -155,6 +156,12 @@ QQmlExtensionPlugin::~QQmlExtensionPlugin()
 {
 }
 
+QUrl QQmlExtensionPlugin::baseUrl() const
+{
+    Q_D(const QQmlExtensionPlugin);
+    return d->baseUrl;
+}
+
 /*!
     \fn void QQmlExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 

diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h
index 8568565..170c791 100644 (file)
--- a/src/qml/qml/qqmlextensionplugin.h
+++ b/src/qml/qml/qqmlextensionplugin.h
@@ -43,28 +43,31 @@
 #define QQMLEXTENSIONPLUGIN_H
 
 #include <QtCore/qplugin.h>
-
+#include <QtCore/QUrl>
 #include <QtQml/qqmlextensioninterface.h>
 
 QT_BEGIN_NAMESPACE
 
-
 class QQmlEngine;
+class QQmlExtensionPluginPrivate;
 
-class Q_QML_EXPORT QQmlExtensionPlugin : public QObject, 
-                                                         public QQmlExtensionInterface
+class Q_QML_EXPORT QQmlExtensionPlugin
+    : public QObject
+    , public QQmlExtensionInterface
 {
     Q_OBJECT
+    Q_DECLARE_PRIVATE(QQmlExtensionPlugin)
     Q_INTERFACES(QQmlExtensionInterface)
     Q_INTERFACES(QQmlTypesExtensionInterface)
 public:
     explicit QQmlExtensionPlugin(QObject *parent = 0);
     ~QQmlExtensionPlugin();
 
+    QUrl baseUrl() const;
+
     virtual void registerTypes(const char *uri) = 0;
     virtual void initializeEngine(QQmlEngine *engine, const char *uri);
 
-private:
     Q_DISABLE_COPY(QQmlExtensionPlugin)
 };
 

diff --git a/src/qml/qml/qqmlextensionplugin_p.h b/src/qml/qml/qqmlextensionplugin_p.h
new file mode 100644 (file)
index 0000000..747bc78
--- /dev/null
+++ b/src/qml/qml/qqmlextensionplugin_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLEXTENSIONPLUGIN_P_H
+#define QQMLEXTENSIONPLUGIN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qobject_p.h>
+#include "qqmlextensionplugin.h"
+
+QT_BEGIN_NAMESPACE
+
+class QQmlExtensionPluginPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QQmlExtensionPlugin)
+
+public:
+    static QQmlExtensionPluginPrivate* get(QQmlExtensionPlugin *e) { return e->d_func(); }
+
+    QUrl baseUrl;
+
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLEXTENSIONPLUGIN_P_H

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 95b59f9..5374f2d 100644 (file)
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -49,6 +49,8 @@
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qreadwritelock.h>
 #include <QtQml/qqmlextensioninterface.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <private/qqmlextensionplugin_p.h>
 #include <private/qqmlglobal_p.h>
 #include <private/qqmltypenamecache_p.h>
 #include <private/qqmlengine_p.h>
@@ -1683,6 +1685,10 @@ bool QQmlImportDatabase::importPlugin(const QString &filePath, const QString &ur
 
                     QQmlMetaType::setTypeRegistrationNamespace(typeNamespace);
 
+                    if (QQmlExtensionPlugin *plugin = qobject_cast<QQmlExtensionPlugin *>(instance)) {
+                        // Set the directory, not the library file itself
+                        QQmlExtensionPluginPrivate::get(plugin)->baseUrl = QUrl::fromLocalFile(fileInfo.absolutePath());
+                    }
                     iface->registerTypes(moduleId);
 
                     registrationFailures = QQmlMetaType::typeRegistrationFailures();