QQMultiPointerHandler: don't steal grab if keepMouseGrab/keepTouchGrab

An Item (such as MPTA with onGestureStarted: gesture.grab()) may set
these flags, traditionally to prevent Flickable from stealing the grab.
QQuickMultiPointerHandler (and thus PinchHandler) now respects these
flags too.

Change-Id: Iac3ab796c5aa410be45639d679ecf82b7c44a442
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp
index 67d32cdb18..3af77593e2 100644
--- a/src/quick/handlers/qquickpinchhandler.cpp
+++ b/src/quick/handlers/qquickpinchhandler.cpp
@@ -232,8 +232,8 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event)
         // Verify that least one of the points have moved beyond threshold needed to activate the handler
         for (QQuickEventPoint *point : qAsConst(m_currentPoints)) {
             if (QQuickWindowPrivate::dragOverThreshold(point)) {
-                grabPoints(m_currentPoints);
-                setActive(true);
+                if (grabPoints(m_currentPoints))
+                    setActive(true);
                 break;
             }
         }