Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I53d801a88bda3a8b8519b6002e1d37053c03e103

2 files changed, 7 insertions, 6 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp
index be265222..6bb65e9f 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp
@@ -42,9 +42,13 @@
 
 QT_BEGIN_NAMESPACE
 
-QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) :
-    QSensorGestureRecognizer(parent),
-  orientationReading(0), proximityReading(0),active(0), detecting(0)
+QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent)
+    : QSensorGestureRecognizer(parent),
+      orientationReading(0),
+      proximityReading(0),
+      timer(0),
+      active(0),
+      detecting(0)
 {
 }
 
@@ -120,7 +124,6 @@ void QCoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading)
             detecting = true;
         }
     }
-    lastTs = reading->timestamp();
 }
 
 void QCoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading)
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index e7ca3ab9..1478e70d 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -76,10 +76,8 @@ private:
     bool proximityReading;
 
     QTimer *timer;
-    QtSensorGestureSensorHandler *handler;
     bool active;
     bool detecting;
-    qreal lastTs;
 };
 
 QT_END_NAMESPACE