From 88057e3407aa16d0a9dc9dcc6d0ea6174dce693b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 21 Oct 2014 17:31:55 +0200
Subject: QSwipeGestureRecognizer: Fix gesture cancel on direction change.

Task-number: QTBUG-12736
Change-Id: I6d8d09843b45df17cb9158070f63b3397c5b4c07
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
---
 src/widgets/kernel/qstandardgestures.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/widgets/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp
index 78a2c65060..0822c04033 100644
--- a/src/widgets/kernel/qstandardgestures.cpp
+++ b/src/widgets/kernel/qstandardgestures.cpp
@@ -341,10 +341,10 @@ QGestureRecognizer::Result QSwipeGestureRecognizer::recognize(QGesture *state,
                 if (d->horizontalDirection == QSwipeGesture::NoDirection)
                     d->horizontalDirection = horizontal;
                 if (d->verticalDirection != vertical || d->horizontalDirection != horizontal) {
-                    // the user has changed the direction!
                     result = QGestureRecognizer::CancelGesture;
+                } else {
+                    result = QGestureRecognizer::TriggerGesture;
                 }
-                result = QGestureRecognizer::TriggerGesture;
             } else {
                 if (q->state() != Qt::NoGesture)
                     result = QGestureRecognizer::TriggerGesture;
-- 
cgit v1.2.3