From cadb17a958653fbfea31ff2f924eb0d72b3f83a1 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 16 Feb 2012 14:08:54 +1000 Subject: Add basic plugin metadata for QtQuick2 import plugin. This indirectly fixes the qdebugmessageservice autotest, which was getting confused by the "old plugin" warning. Also updated the extension plugin interface to use org.qt-project rather than com.trolltech. Change-Id: I94fc6cf03d23e606c2e2333b013dd2b698f04623 Reviewed-by: Martin Jones --- src/declarative/qml/qdeclarativeextensioninterface.h | 4 ++-- src/imports/qtquick2/plugin.cpp | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index e774175862..fcfaa7c402 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -65,8 +65,8 @@ public: virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0; }; -Q_DECLARE_INTERFACE(QDeclarativeTypesExtensionInterface, "com.trolltech.Qt.QDeclarativeTypesExtensionInterface/1.0") -Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0") +Q_DECLARE_INTERFACE(QDeclarativeTypesExtensionInterface, "org.qt-project.Qt.QDeclarativeTypesExtensionInterface/1.0") +Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "org.qt-project.Qt.QDeclarativeExtensionInterface/1.0") QT_END_NAMESPACE diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 30f6a3cd6d..1f110d7a83 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QtQuick2Plugin : public QDeclarativeExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface/1.0") public: virtual void registerTypes(const char *uri) { @@ -61,8 +62,3 @@ public: QT_END_NAMESPACE #include "plugin.moc" - -//![plugin export decl] -Q_EXPORT_PLUGIN2(qtquick2plugin, QT_PREPEND_NAMESPACE(QtQuick2Plugin)); -//![plugin export decl] - -- cgit v1.2.3