Change the cursor within HoverHandler.margin

The visual cursor feedback was inconsistent with the hovered property
when a margin is set.

Amends 1c44804600ad3dbeb60d1f5209ce9cf937d30ab3

Pick-to: 5.15
Fixes: QTBUG-85303
Task-number: QTBUG-68073
Change-Id: I25506baecaecbd6450a0e95786f103024b46b1b8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 11 insertions, 7 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 20a90abe21..2b3f788201 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3315,15 +3315,19 @@ QPair<QQuickItem*, QQuickPointerHandler*> QQuickWindowPrivate::findCursorItemAnd
             if (ret.first)
                 return ret;
         }
-        if (itemPrivate->hasCursor || itemPrivate->hasCursorHandler) {
-            QPointF p = item->mapFromScene(scenePos);
-            if (!item->contains(p))
-                return {nullptr, nullptr};
-            if (itemPrivate->hasCursorHandler) {
-                if (auto handler = itemPrivate->effectiveCursorHandler())
+        if (itemPrivate->hasCursorHandler) {
+            if (auto handler = itemPrivate->effectiveCursorHandler()) {
+                QQuickPointerEvent *pointerEvent = pointerEventInstance(QPointingDevice::primaryPointingDevice(), QEvent::MouseMove);
+                pointerEvent->point(0)->reset(Qt::TouchPointMoved, scenePos, quint64(1) << 24 /* mouse has device ID 1 */, 0);
+                pointerEvent->point(0)->setAccepted(true);
+                pointerEvent->localize(item);
+                if (handler->parentContains(pointerEvent->point(0)))
                     return {item, handler};
             }
-            if (itemPrivate->hasCursor)
+        }
+        if (itemPrivate->hasCursor) {
+            QPointF p = item->mapFromScene(scenePos);
+            if (item->contains(p))
                 return {item, nullptr};
         }
     }