From f025ce23a742495c6cb7badad5b561a9eeb94025 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Fri, 26 Aug 2016 11:58:34 +0200
Subject: [PATCH] Improve robustness of QML plugin loading
Use a variable that expands to the latest plugin version instead of
hard-coding the string.
Change-Id: I8f7864e4ead85487943ed2c4dc2ae2584005c1c9
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
src/imports/location/location.cpp | 2 +-
src/imports/positioning/positioning.cpp | 2 +-
tests/plugins/declarativetestplugin/locationtest.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index b42933f00..6405313bb 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -83,7 +83,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0"
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid
FILE "plugin.json")
public:
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 5137da222..4c54c2118 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -506,7 +506,7 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0"
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid
FILE "plugin.json")
public:
diff --git a/tests/plugins/declarativetestplugin/locationtest.cpp b/tests/plugins/declarativetestplugin/locationtest.cpp
index f0389d904..44e74e861 100644
--- a/tests/plugins/declarativetestplugin/locationtest.cpp
+++ b/tests/plugins/declarativetestplugin/locationtest.cpp
@@ -48,7 +48,7 @@ static QObject *helper_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
class QLocationDeclarativeTestModule: 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)
{
--
GitLab