From 29232a2bc207fb7dc44532f64bbe35d9181340c6 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Fri, 26 Aug 2016 11:58:48 +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: I3bdbee161e4a3b59127dc4f00a0c9ce9386b67c2
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
src/imports/audioengine/audioengine.cpp | 2 +-
src/imports/multimedia/multimedia.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index 8eb2dea33..a132af49a 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
QAudioEngineDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 872b2ae61..2a5e8cd2c 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -81,7 +81,7 @@ static QObject *multimedia_global_object(QQmlEngine *qmlEngine, QJSEngine *jsEng
class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
--
GitLab