QQuickWindowPrivate::deliverTouchCancelEvent: deliver to handlers too

Now that onGrabChanged() is unified, we have a means to tell the
handler when it loses its grab due to a touch event being canceled.

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

1 files changed, 13 insertions, 3 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index a7ab0f01b0..bbea32f905 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -681,16 +681,26 @@ void QQuickEventPoint::setGrabberPointerHandler(QQuickPointerHandler *grabber, b
 */
 void QQuickEventPoint::cancelExclusiveGrab()
 {
-    if (m_exclusiveGrabber.isNull()) {
+    if (m_exclusiveGrabber.isNull())
         qWarning("cancelGrab: no grabber");
+    else
+        cancelExclusiveGrabImpl();
+}
+
+void QQuickEventPoint::cancelExclusiveGrabImpl(QTouchEvent *cancelEvent)
+{
+    if (m_exclusiveGrabber.isNull())
         return;
-    }
     if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) {
         qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << hex << m_pointId << pointStateString(this)
                                << ": grab (exclusive)" << m_exclusiveGrabber << "-> nullptr";
     }
-    if (auto handler = grabberPointerHandler())
+    if (auto handler = grabberPointerHandler()) {
         handler->onGrabChanged(handler, CancelGrabExclusive, this);
+    } else if (auto item = grabberItem()) {
+        if (cancelEvent)
+            QCoreApplication::sendEvent(item, cancelEvent);
+    }
     m_exclusiveGrabber.clear();
 }