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 | |
parent | 660b931615211cc85c0086448409c43526c6f85f (diff) | |
parent | 0862901b142f36e91b98dbdcb2c36585020bb33d (diff) | |
download | qtsensors-bbc476ecb97713ef88f7ff8be4f5f0131caabd1b.tar.gz |
Merge branch 'stable' into dev
Change-Id: Id44a93ddf8dc778f44e9684842a759d585558ee4
9 files changed, 8 insertions, 7 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: diff --git a/src/plugins/sensorgestures/qtsensors/plugin.json b/src/plugins/sensorgestures/qtsensors/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- 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 dcb7b89..08b5848 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 a25b7f7..9715902 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 5980a49..848a4f0 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 8a55b3a..0000000 --- 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 7b95064..ea69dd0 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: diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp index 538e159..da1d1f5 100644 --- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp +++ b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp @@ -116,7 +116,7 @@ void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_data() QTest::newRow("QtSensors.doubletap") << "QtSensors.doubletap"; - QTest::newRow("QtSensors.hover") << "QtSensors.hover"; + QTest::newRow("QtSensors.freefall") << "QtSensors.freefall"; QTest::newRow("QtSensors.hover") << "QtSensors.hover"; QTest::newRow("QtSensors.shake2") << "QtSensors.shake2"; QTest::newRow("QtSensors.slam") << "QtSensors.slam"; |