summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qdeclarativegesturerecognizers.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/qdeclarativegesturerecognizers.cpp b/qdeclarativegesturerecognizers.cpp
index 2943a26..1aa5b6b 100644
--- a/qdeclarativegesturerecognizers.cpp
+++ b/qdeclarativegesturerecognizers.cpp
@@ -305,6 +305,15 @@ QGestureRecognizer::Result QPanGestureRecognizer::recognize(QGesture *state,
}
return QGestureRecognizer::CancelGesture;
#endif
+ case QEvent::Gesture: {
+ // We check for other gesture events: TapAndHold and Pan both cancel the simple Tap
+ QGestureEvent *ge = static_cast<QGestureEvent *>(event);
+ if (QGesture *g = ge->gesture(Qt::TapGesture))
+ g->setGestureCancelPolicy(QGesture::CancelAllInContext);
+ if (QGesture *g = ge->gesture(Qt::TapAndHoldGesture))
+ g->setGestureCancelPolicy(QGesture::CancelAllInContext);
+ return QGestureRecognizer::Ignore;
+ }
default:
result = QGestureRecognizer::Ignore;
break;