summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-06-04 11:38:57 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-04 20:57:27 +0200
commit9b92bc82292ea58b9702e7ecd649597847d9901b (patch)
tree102d27f2e88026eaceef4833a1a7f4aa98c50e6a /src
parentd3635562f38cf8b037fadbc58d62841cf15f527a (diff)
Fix warning by the compiler, probably caused by a bad conflict resolution
qshakerecognizer.cpp:161:28: error: expression result unused [-Werror,-Wunused-value] The statement was unused, the last branch of an || that was removed in fb06538f. Change-Id: I4badb3e5f4272086d44004b9beaca330f8ed7ab6 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sensorgestures/shake/qshakerecognizer.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
index b70ad033..7c4133b3 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
@@ -158,6 +158,5 @@ bool QShakeSensorGestureRecognizer::checkForShake(AccelData prevSensorData, Acce
return (deltaX > threshold
|| deltaY > threshold
|| deltaZ > threshold);
- (deltaY > threshold && deltaZ > threshold);
}