From ee177fa9cdabeca3252907dcbdfba1b28b324c2d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 25 Aug 2016 10:29:49 +0200 Subject: Fix loading of QML plugins Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: I2e58ac58e289010555260eef078307a8a7bf4845 Reviewed-by: Alex Blasche --- src/imports/bluetooth/plugin.cpp | 2 +- src/imports/nfc/plugin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp index eca5736e..d6c47e35 100644 --- a/src/imports/bluetooth/plugin.cpp +++ b/src/imports/bluetooth/plugin.cpp @@ -57,7 +57,7 @@ QT_USE_NAMESPACE class QBluetoothQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QBluetoothQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 5f2ccd26..b71f1f24 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -59,7 +59,7 @@ QT_USE_NAMESPACE class QNfcQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QNfcQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } -- cgit v1.2.3