diff options
author | Lorn Potter <lorn.potter@jollamobile.com> | 2013-06-22 08:18:48 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-22 21:31:18 +0200 |
commit | e26a41a51d4d414160346703ed0d05416c3987b5 (patch) | |
tree | c34bc363db4c2c6d8269d58c2435476ab8d28822 /examples | |
parent | 4a96b1e9ac7bfdf3409ce27db2e58db89222ef22 (diff) | |
download | qtsensors-e26a41a51d4d414160346703ed0d05416c3987b5.tar.gz |
Fix loading of all sensorgesture plugins.v5.1.0-rc2v5.1.0
After the change in qtbase 732dcfe7, only the first
sensorgesture plugin was actually being loaded.
Since the FILE argument of Q_PLUGIN_METADATA is optional,
removing that and the json file fixes the following bugs:
QTBUG-31900
QTBUG-31901
Change-Id: I7c0b67605a8fe680c37639f08926140e137dbe66
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/sensors/qmlsensorgestures/plugin/plugin.json | 1 | ||||
-rw-r--r-- | examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/sensors/qmlsensorgestures/plugin/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h index 0daa743..7092aec 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h @@ -49,7 +49,7 @@ class QCounterGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: |