summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-08-26 12:03:30 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-08-26 11:17:46 +0000
commit0032fd615097baeff2414e352e095bc412000941 (patch)
tree6a16e98152238104c544603148a5440f1c355a4c
parentb421290b67507cfe125db206f378fc1b38eaae4e (diff)
downloadqtsensors-0032fd615097baeff2414e352e095bc412000941.tar.gz
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: I84e4d927489f9a14615db399b560af4b352bf045 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--examples/sensors/grue/import/main.cpp2
-rw-r--r--examples/sensors/sensor_explorer/import/main.cpp2
-rw-r--r--src/imports/sensors/sensors.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index dc2372e..f321acf 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class GrueSensorQmlImport : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "import.json")
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "import.json")
public:
virtual void registerTypes(const char *uri)
{
diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp
index 03f83a3..ef50f5a 100644
--- a/examples/sensors/sensor_explorer/import/main.cpp
+++ b/examples/sensors/sensor_explorer/import/main.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "import.json")
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "import.json")
public:
virtual void registerTypes(const char *uri)
{
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index c6f61c2..d1f5bb4 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -93,7 +93,7 @@ static QObject *global_object_50(QQmlEngine *, QJSEngine *)
class QtSensorsDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json")
public:
QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
virtual void registerTypes(const char *uri)