diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:57:59 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:58:15 +0200 |
| commit | bbc476ecb97713ef88f7ff8be4f5f0131caabd1b (patch) | |
| tree | c6580b8315aaa5ad0f0bad3843fa10dbab3d0ae1 /src | |
| parent | 660b931615211cc85c0086448409c43526c6f85f (diff) | |
| parent | 0862901b142f36e91b98dbdcb2c36585020bb33d (diff) | |
Merge branch 'stable' into dev
Change-Id: Id44a93ddf8dc778f44e9684842a759d585558ee4
Diffstat (limited to 'src')
6 files changed, 6 insertions, 4 deletions
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/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) { } 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 <QSensorGestureRecognizer *> QtSensorGesturePlugin::createRecognizers() recognizers.append(new QTwistSensorGestureRecognizer(this)); + recognizers.append(new QFreefallSensorGestureRecognizer(this)); return recognizers; } 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: |