QSwipeGestureRecognizer: Prevent cancel in startup-phase.

Replace the boolean 'started' member by an enumeration which indicates
the startup phase. While in that phase, do not cancel when pressed
points are detected for fewer than 3 touch points.

Task-number: QTBUG-15768
Change-Id: Ic57b19e3002392fb632f551f615d80ada9831d34
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h
index 8668145d8a..183a2eba0f 100644
--- a/src/widgets/kernel/qgesture_p.h
+++ b/src/widgets/kernel/qgesture_p.h
@@ -134,11 +134,17 @@ class QSwipeGesturePrivate : public QGesturePrivate
     Q_DECLARE_PUBLIC(QSwipeGesture)
 
 public:
+    enum State {
+        NoGesture,
+        Started,
+        ThreePointsReached
+    };
+
     QSwipeGesturePrivate()
         : horizontalDirection(QSwipeGesture::NoDirection),
           verticalDirection(QSwipeGesture::NoDirection),
           swipeAngle(0),
-          started(false), velocityValue(0)
+          state(NoGesture), velocityValue(0)
     {
     }
 
@@ -150,7 +156,7 @@ public:
     qreal swipeAngle;
 
     QPoint lastPositions[3];
-    bool started;
+    State state;
     qreal velocityValue;
     QElapsedTimer time;
 };