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 From cada795ca78ba8369dd6fc27b88f57036fff308f Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sun, 30 Jun 2013 07:16:47 +1000 Subject: Freefall gesture needs to be initialized into plugin to be usable This fixes the flaky unit test failures. It also adds freefall to unit test. Task-number: QTBUG-32108 Change-Id: Ia1ee852b1e57b937fd7368073e259a139da9a697 Reviewed-by: Frederik Gladhorn Reviewed-by: Thomas McGuire --- src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp index a25b7f70..9715902a 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp @@ -56,6 +56,7 @@ #include "qslamgesturerecognizer.h" #include "qturnoversensorgesturerecognizer.h" #include "qwhipsensorgesturerecognizer.h" +#include "qfreefallsensorgesturerecognizer.h" QT_BEGIN_NAMESPACE @@ -75,6 +76,7 @@ QStringList QtSensorGesturePlugin::supportedIds() const list << "QtSensors.cover"; list << "QtSensors.doubletap"; list << "QtSensors.hover"; + list << "QtSensors.freefall"; list << "QtSensors.pickup"; list << "QtSensors.shake2"; list << "QtSensors.slam"; @@ -106,6 +108,7 @@ QList QtSensorGesturePlugin::createRecognizers() recognizers.append(new QTwistSensorGestureRecognizer(this)); + recognizers.append(new QFreefallSensorGestureRecognizer(this)); return recognizers; } -- cgit v1.2.3 From 0862901b142f36e91b98dbdcb2c36585020bb33d Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 12 Jul 2013 12:47:38 +1000 Subject: Initialize active variable in doubletap gesture Fixes flakiness. Change-Id: I6e8beaf5106c4dd1e26c3bf038ba9e394d0f080d Reviewed-by: Sergio Ahumada --- .../sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp index dcb7b891..08b58487 100644 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE QDoubleTapSensorGestureRecognizer::QDoubleTapSensorGestureRecognizer(QObject *parent) : QSensorGestureRecognizer(parent) + , active(0) { } -- cgit v1.2.3