diff options
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 3571feb2cc..53f855e56d 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7330,7 +7330,7 @@ void QQuickItem::ungrabMouse() if (!d->window) return; QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(d->window); - windowPriv->removeGrabber(this, true, false); + windowPriv->removeGrabber(this, true, (windowPriv->touchMouseId != -1 && windowPriv->touchMouseDevice)); } diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 70c8590ae7..fa251b7d78 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1656,6 +1656,9 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven auto point = pointerEvent->point(0); lastMousePosition = point->scenePos(); QQuickItem *grabber = point->grabber(); + if (!grabber && touchMouseId != -1 && touchMouseDevice) + grabber = q->mouseGrabberItem(); + if (grabber) { // if the update consists of changing button state, then don't accept it // unless the button is one in which the item is interested |