diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-26 11:55:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-26 13:42:32 +0000 |
| commit | 7cc41b9f6c18365baee5a2d08221bbd98b706e3c (patch) | |
| tree | ee5a60b97caee7d88dd7db447df0ff06d98d6687 | |
| parent | ed4fdee825f1bb5db626909c7b4353a3122ff395 (diff) | |
Improve robustness of QML plugin loading
Use a variable that expands to the latest plugin version instead of
hard-coding the string.
Change-Id: Ia933f761c6f91bc1cedeba9f7d6e1fb2ecb810d5
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
6 files changed, 6 insertions, 6 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h index 48c7fd136..a9b215c4a 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class Qt3DQuick3DCorePlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: Qt3DQuick3DCorePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h index 8421c6eb4..f5ea6a7f1 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class Qt3DQuick3DExtrasPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: Qt3DQuick3DExtrasPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.h b/src/quick3d/imports/input/qt3dquick3dinputplugin.h index d644614e7..8a54eaa53 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.h +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class Qt3DQuick3DInputPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: Qt3DQuick3DInputPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h index 203bc41b2..a0d95c597 100644 --- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h +++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class Qt3DQuick3DLogicPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: Qt3DQuick3DLogicPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h index 53235fdb9..181965fe1 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.h +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: Qt3DQuick3DRenderPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h index 773feb296..df85b4cd7 100644 --- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h +++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QtQuickScene3DPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuickScene3DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) Q_DECL_OVERRIDE; |