Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl

Change-Id: I658cff3c394ed233005efe6b12c515d2a886ef6b

1 files changed, 14 insertions, 1 deletions

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 9a68be4c49..e12e85db64 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -2445,7 +2445,20 @@ bool QQuickFlickable::filterMouseEvent(QQuickItem *receiver, QMouseEvent *event)
 bool QQuickFlickable::childMouseEventFilter(QQuickItem *i, QEvent *e)
 {
     Q_D(QQuickFlickable);
-    if (!isVisible() || !isEnabled() || !isInteractive() || !d->wantsPointerEvent(e)) {
+    auto wantsPointerEvent_helper = [=]() {
+        bool wants = true;
+        if (e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove) {
+            QMouseEvent *me = static_cast<QMouseEvent*>(e);
+            QPointF itemLocalPos = me->localPos();
+            me->setLocalPos(mapFromItem(i, itemLocalPos));
+            wants = d->wantsPointerEvent(e);
+            // re-localize event back to \a i before returning
+            me->setLocalPos(itemLocalPos);
+        }
+        return wants;
+    };
+
+    if (!isVisible() || !isEnabled() || !isInteractive() || !wantsPointerEvent_helper()) {
         d->cancelInteraction();
         return QQuickItem::childMouseEventFilter(i, e);
     }