diff options
| author | Lorn Potter <lorn.potter@jollamobile.com> | 2013-06-30 07:16:47 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 15:34:06 +0200 |
| commit | cada795ca78ba8369dd6fc27b88f57036fff308f (patch) | |
| tree | 6e35144000649edc451ec2c91396cf1bd26892e1 | |
| parent | e26a41a51d4d414160346703ed0d05416c3987b5 (diff) | |
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 <frederik.gladhorn@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| -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 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/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp index 538e1595..da1d1f56 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"; |