Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I507e252f9cb11b75dd9f7f409c39d93094e8c3ef

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 51c662cb3a..ad3a39dd71 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -913,10 +913,14 @@ void QQuickEventPoint::setGrabberPointerHandler(QQuickPointerHandler *grabber, b
                         passiveGrabber->onGrabChanged(grabber, OverrideGrabPassive, this);
                 }
             }
-            if (oldGrabberHandler)
+            if (oldGrabberHandler) {
                 oldGrabberHandler->onGrabChanged(oldGrabberHandler, (grabber ? CancelGrabExclusive : UngrabExclusive), this);
-            else if (oldGrabberItem && pointerEvent()->asPointerTouchEvent())
-                oldGrabberItem->touchUngrabEvent();
+            } else if (oldGrabberItem) {
+                if (pointerEvent()->asPointerTouchEvent())
+                    oldGrabberItem->touchUngrabEvent();
+                else if (pointerEvent()->asPointerMouseEvent())
+                    oldGrabberItem->mouseUngrabEvent();
+            }
             // touchUngrabEvent() can result in the grabber being set to null (MPTA does that, for example).
             // So set it again to ensure that final state is what we want.
             m_exclusiveGrabber = QPointer<QObject>(grabber);