diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-03 16:17:59 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-03 16:18:05 +0200 |
commit | e89291bc2d45b970c66b816a4f781925406f0bf5 (patch) | |
tree | 6021a1767ba2720a9e27ab68371f85c1d9be4b54 | |
parent | 9cc3a315e5ff6363958833dc77fc13e1672d3bb2 (diff) | |
parent | cada795ca78ba8369dd6fc27b88f57036fff308f (diff) | |
download | qtsensors-e89291bc2d45b970c66b816a4f781925406f0bf5.tar.gz |
Merge branch 'release' into stable
Change-Id: I08bb0d6a9d4b0dddf76f463c32b3a4efdd632f0d
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp | 3 | ||||
-rw-r--r-- | tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
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/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"; |