From 57a7bc73545b137dccc098bc07aeaf9dd9bf8207 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 6 May 2016 13:40:35 +0200 Subject: Cleanup QQmlExtensionInterface usage Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann --- src/controls/Styles/Android/plugin.cpp | 2 +- src/controls/plugin.h | 2 +- src/dialogs/Private/dialogsprivateplugin.cpp | 2 +- src/dialogs/plugin.cpp | 2 +- src/extras/Styles/Flat/flatstyleplugin.h | 2 +- src/extras/plugin.h | 2 +- src/layouts/plugin.cpp | 2 +- src/widgets/widgetsplugin.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp index b5435f7f..ea81bf72 100644 --- a/src/controls/Styles/Android/plugin.cpp +++ b/src/controls/Styles/Android/plugin.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QtQuickControlsAndroidStylePlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: void registerTypes(const char *uri); diff --git a/src/controls/plugin.h b/src/controls/plugin.h index eeaeda08..268eaf90 100644 --- a/src/controls/plugin.h +++ b/src/controls/plugin.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QtQuickControlsPlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp index aabce71f..40aeefff 100644 --- a/src/dialogs/Private/dialogsprivateplugin.cpp +++ b/src/dialogs/Private/dialogsprivateplugin.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 65740024..21284697 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE class QtQuick2DialogsPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { } diff --git a/src/extras/Styles/Flat/flatstyleplugin.h b/src/extras/Styles/Flat/flatstyleplugin.h index 4f1fb6d1..98401df9 100644 --- a/src/extras/Styles/Flat/flatstyleplugin.h +++ b/src/extras/Styles/Flat/flatstyleplugin.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasStylesPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasStylesPlugin(QObject *parent = 0); diff --git a/src/extras/plugin.h b/src/extras/plugin.h index 08eae1c1..6362813a 100644 --- a/src/extras/plugin.h +++ b/src/extras/plugin.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasPlugin(QObject *parent = 0); diff --git a/src/layouts/plugin.cpp b/src/layouts/plugin.cpp index 6a670539..8ccd50f5 100644 --- a/src/layouts/plugin.cpp +++ b/src/layouts/plugin.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QtQuickLayoutsPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) { diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp index 71243f32..ca17d1be 100644 --- a/src/widgets/widgetsplugin.cpp +++ b/src/widgets/widgetsplugin.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QtQuick2PrivateWidgetsPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) -- cgit v1.2.1