diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:34:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:34:05 +0200 |
| commit | 53a414e33ce45f28b89217678597416b681128d4 (patch) | |
| tree | 51ab26cf4a14662e525c4a648d84dae81090f0c7 /examples | |
| parent | 3523afa703792fabc8bac3febe5541766bc1ccd4 (diff) | |
| parent | df3374bd4bb8af1494f6a35b1102f15cfe9633e0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaeb7c9f62b50d68e0cedb95c523aebcceb9128c0
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/sensors/grue/import/main.cpp | 2 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/import/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp index dc2372e2..f321acff 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 03f83a33..ef50f5af 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) { |