From e26a41a51d4d414160346703ed0d05416c3987b5 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sat, 22 Jun 2013 08:18:48 +1000 Subject: Fix loading of all sensorgesture plugins. 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 Reviewed-by: Lars Knoll --- src/plugins/sensorgestures/qtsensors/plugin.json | 1 - src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h | 2 +- src/plugins/sensorgestures/shake/plugin.json | 1 - src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src/plugins/sensorgestures/qtsensors/plugin.json delete mode 100644 src/plugins/sensorgestures/shake/plugin.json (limited to 'src') diff --git a/src/plugins/sensorgestures/qtsensors/plugin.json b/src/plugins/sensorgestures/qtsensors/plugin.json deleted file mode 100644 index 8a55b3ae..00000000 --- a/src/plugins/sensorgestures/qtsensors/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h index 5980a490..848a4f08 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QtSensorGesturePlugin : 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: diff --git a/src/plugins/sensorgestures/shake/plugin.json b/src/plugins/sensorgestures/shake/plugin.json deleted file mode 100644 index 8a55b3ae..00000000 --- a/src/plugins/sensorgestures/shake/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index 7b950647..ea69dd0a 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -50,7 +50,7 @@ class QShakeSensorGesturePlugin : 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: -- cgit v1.2.3