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

Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4

1 files changed, 20 insertions, 5 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 2671b9c9a2..19dd81b6fc 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -195,8 +195,8 @@ Item {
 */
 
 /*!
-    \qmlproperty int QtQuick::MouseEvent::x
-    \qmlproperty int QtQuick::MouseEvent::y
+    \qmlproperty real QtQuick::MouseEvent::x
+    \qmlproperty real QtQuick::MouseEvent::y
 
     These properties hold the coordinates of the position supplied by the mouse event.
 */
@@ -342,8 +342,8 @@ Item {
 */
 
 /*!
-    \qmlproperty int QtQuick::WheelEvent::x
-    \qmlproperty int QtQuick::WheelEvent::y
+    \qmlproperty real QtQuick::WheelEvent::x
+    \qmlproperty real QtQuick::WheelEvent::y
 
     These properties hold the coordinates of the position supplied by the wheel event.
 */
@@ -1225,9 +1225,24 @@ QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item, bool i
         auto p = m_touchPoints.at(i);
         if (p->isAccepted())
             continue;
+        // include points where item is the grabber
         bool isGrabber = p->exclusiveGrabber() == item;
+        // include newly pressed points inside the bounds
         bool isPressInside = p->state() == QQuickEventPoint::Pressed && item->contains(item->mapFromScene(p->scenePos()));
-        if (!(isGrabber || isPressInside || isFiltering))
+
+        // filtering: (childMouseEventFilter) include points that are grabbed by children of the target item
+        bool grabberIsChild = false;
+        auto parent = p->grabberItem();
+        while (isFiltering && parent) {
+            if (parent == item) {
+                grabberIsChild = true;
+                break;
+            }
+            parent = parent->parentItem();
+        }
+        bool filterRelevant = isFiltering && grabberIsChild;
+
+        if (!(isGrabber || isPressInside || filterRelevant))
             continue;
 
         const QTouchEvent::TouchPoint *tp = touchPointById(p->pointId());