diff options
author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-10-04 11:49:02 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-10-05 18:15:04 +0000 |
commit | 6b6ee829c7e0df302eba30ce1f96302c5661279c (patch) | |
tree | ae96017090cf2e45a4cfad26b965bdfdc166e103 | |
parent | 526fb971ae9a2a6c8fce27883d9c62a9ea16bcdf (diff) |
Fix touch points delivered to the filtering parent
The touchpoints delivered to the filtering parent should be the ones
that would be delivered to the original receiver (child item). That
is the intent of filtering.
Task-number: QTBUG-62628
Change-Id: I7ed965c741aaec362f07d65cd6d0789c82ba71e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index c15079b3d7..4c79c40164 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2793,7 +2793,7 @@ bool QQuickWindowPrivate::sendFilteredPointerEventImpl(QQuickPointerEvent *event #endif if (acceptsTouchEvents || receiver->acceptedMouseButtons()) { // get a touch event customized for delivery to filteringParent - QScopedPointer<QTouchEvent> filteringParentTouchEvent(pte->touchEventForItem(filteringParent, true)); + QScopedPointer<QTouchEvent> filteringParentTouchEvent(pte->touchEventForItem(receiver, true)); if (filteringParentTouchEvent) { QVarLengthArray<QPair<QQuickPointerHandler *, QQuickEventPoint *>, 32> passiveGrabsToCancel; if (filteringParent->childMouseEventFilter(receiver, filteringParentTouchEvent.data())) { |