diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-25 10:29:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-26 07:27:05 +0000 |
| commit | ee177fa9cdabeca3252907dcbdfba1b28b324c2d (patch) | |
| tree | 443fe1d60c062ec53e953765fabc7d672e0c0a74 | |
| parent | 77b5b58b182e09b4f9f0c8b0d8b0f907fe8578ae (diff) | |
Fix loading of QML pluginsv5.8.0-alpha1
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 <alexander.blasche@qt.io>
| -rw-r--r-- | src/imports/bluetooth/plugin.cpp | 2 | ||||
| -rw-r--r-- | 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(); } |