summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@jollamobile.com>2013-06-22 08:18:48 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-22 21:31:18 +0200
commite26a41a51d4d414160346703ed0d05416c3987b5 (patch)
treec34bc363db4c2c6d8269d58c2435476ab8d28822
parent4a96b1e9ac7bfdf3409ce27db2e58db89222ef22 (diff)
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>
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/plugin.json1
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/plugin.json1
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h2
-rw-r--r--src/plugins/sensorgestures/shake/plugin.json1
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h2
6 files changed, 3 insertions, 6 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/sensors/qmlsensorgestures/plugin/plugin.json
deleted file mode 100644
index 8a55b3ae..00000000
--- 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 0daa743d..7092aec8 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:
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: