Let passive-grabbing PointerHandlers see all point updates

even if all points are accepted or grabbed.  A passive grab isn't much
good if there are cases where the handler is prevented from monitoring.
This enables e.g. the PinchHandler to steal the grab when the right
number of touchpoints are present and have moved past the drag threshold,
and enables completion of a couple of autotests.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp
index 84c4e912d1..4db96d8a99 100644
--- a/src/quick/handlers/qquickpinchhandler.cpp
+++ b/src/quick/handlers/qquickpinchhandler.cpp
@@ -349,13 +349,18 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event)
         }
     } else {
         bool containsReleasedPoints = event->isReleaseEvent();
-        if (!active() && !containsReleasedPoints) {
+        if (!active()) {
             // Verify that at least one of the points has moved beyond threshold needed to activate the handler
             for (QQuickEventPoint *point : qAsConst(m_currentPoints)) {
-                if (QQuickWindowPrivate::dragOverThreshold(point)) {
-                    if (grabPoints(m_currentPoints))
-                        setActive(true);
+                if (!containsReleasedPoints && QQuickWindowPrivate::dragOverThreshold(point) && grabPoints(m_currentPoints)) {
+                    setActive(true);
                     break;
+                } else {
+                    setPassiveGrab(point);
+                }
+                if (point->state() == QQuickEventPoint::Pressed) {
+                    point->setAccepted(false); // don't stop propagation
+                    setPassiveGrab(point);
                 }
             }
             if (!active())