From 9b92bc82292ea58b9702e7ecd649597847d9901b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 4 Jun 2013 11:38:57 -0700 Subject: 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 --- src/plugins/sensorgestures/shake/qshakerecognizer.cpp | 1 - 1 file changed, 1 deletion(-) 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); } -- cgit v1.2.3