Send hover events with correct scene and global positions

Task-number: QTBUG-94971
Pick-to: 6.1 6.2
Change-Id: I047223dfdb76a6f1237b9d15b54381cd085aa1ac
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp
index ea6d5a9e77..344024ab7c 100644
--- a/src/quick/util/qquickdeliveryagent.cpp
+++ b/src/quick/util/qquickdeliveryagent.cpp
@@ -930,12 +930,16 @@ bool QQuickDeliveryAgentPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *i
                                       const QPointF &scenePos, const QPointF &lastScenePos,
                                       Qt::KeyboardModifiers modifiers, ulong timestamp)
 {
-    const QTransform transform = QQuickItemPrivate::get(item)->windowToItemTransform();
-
-    //create copy of event
+    auto itemPrivate = QQuickItemPrivate::get(item);
+    const QTransform transform = itemPrivate->windowToItemTransform();
     QHoverEvent hoverEvent(type, transform.map(scenePos), transform.map(lastScenePos), modifiers);
     hoverEvent.setTimestamp(timestamp);
     hoverEvent.setAccepted(true);
+    const QTransform transformToGlobal = itemPrivate->windowToGlobalTransform();
+    QMutableEventPoint &point = QMutableEventPoint::from(hoverEvent.point(0));
+    point.setScenePosition(scenePos);
+    point.setGlobalPosition(transformToGlobal.map(scenePos));
+    point.setGlobalLastPosition(transformToGlobal.map(lastScenePos));
 
     hasFiltered.clear();
     if (sendFilteredMouseEvent(&hoverEvent, item, item->parentItem()))