PointHandler: stay active as long as acceptedButtons satisfied

Ignore buttons which do not fit the acceptedButtons filter, and
do not assume that it's all over when any release happens.

Task-number: QTBUG-66360
Change-Id: I871ea7fdd9b76f06fa0d73382617b287c04d35ab
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/quick/handlers/qquickpointhandler.cpp b/src/quick/handlers/qquickpointhandler.cpp
index da19584b7a..854fadf5cf 100644
--- a/src/quick/handlers/qquickpointhandler.cpp
+++ b/src/quick/handlers/qquickpointhandler.cpp
@@ -139,11 +139,14 @@ void QQuickPointHandler::handleEventPoint(QQuickEventPoint *point)
 {
     switch (point->state()) {
     case QQuickEventPoint::Pressed:
-        setPassiveGrab(point);
-        setActive(true);
+        if ((point->pointerEvent()->buttons() & acceptedButtons()) != Qt::NoButton) {
+            setPassiveGrab(point);
+            setActive(true);
+        }
         break;
     case QQuickEventPoint::Released:
-        setActive(false);
+        if ((point->pointerEvent()->buttons() & acceptedButtons()) == Qt::NoButton)
+            setActive(false);
         break;
     default:
         break;