diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-01-12 16:45:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 00:25:19 +0100 |
| commit | a045f3fe0cfcab90e0ec881eb51ab7015112a177 (patch) | |
| tree | 296a4b414187a22eae86c66310192225b1db1c36 | |
| parent | 06b2d4e54b553a8434ccb9cf26f25eb68c31262e (diff) | |
Remove warnings and re-enable all gesture plugins.
Enable these plugins for simulator builds or it becomes much harder to get
notified of problems. Their presence does not cause a problem.
Fix up the warnings so we can build with -Werror again.
Change-Id: I2e9f6c2bd5f6156abdc4fa719c3a53962a9328d2
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
4 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp index 98cf943f..bc3d20d4 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp @@ -125,7 +125,6 @@ void QPickupSensorGestureRecognizer::accelChanged() void QPickupSensorGestureRecognizer::timeout() { - qreal x = accel->reading()->x(); qreal y = accel->reading()->y(); qreal z = accel->reading()->z(); diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index 4c491fb8..8e75e428 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -171,7 +171,8 @@ void QShake2SensorGestureRecognizer::accelChanged() Q_EMIT shakeDown(); Q_EMIT detected("shakeDown"); break; - + default: + break; }; if (timer->isActive()) { timer->stop(); diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp index 15322dfc..e1f0a3fe 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp @@ -100,7 +100,6 @@ bool QWhipSensorGestureRecognizer::isActive() void QWhipSensorGestureRecognizer::accelChanged() { qreal x = accel->reading()->x(); - qreal y = accel->reading()->y(); if (whipIt) { qreal difference = lastX - x; diff --git a/src/plugins/sensorgestures/sensorgestures.pro b/src/plugins/sensorgestures/sensorgestures.pro index 56f8cde6..3882709b 100644 --- a/src/plugins/sensorgestures/sensorgestures.pro +++ b/src/plugins/sensorgestures/sensorgestures.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!simulator:SUBDIRS += shake qtsensors +SUBDIRS += shake qtsensors simulator:SUBDIRS += simulator |