Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index 7e132f97b6..b6e40d5117 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -83,8 +83,8 @@ protected:
         event->accept();
         ++wheelCount;
         timestamp = event->timestamp();
-        lastWheelEventPos = event->pos();
-        lastWheelEventGlobalPos = event->globalPos();
+        lastWheelEventPos = event->position().toPoint();
+        lastWheelEventGlobalPos = event->globalPosition().toPoint();
     }
 };
 
@@ -1462,7 +1462,8 @@ void tst_qquickitem::wheelEvent()
 
     QPoint localPoint(width / 2, height / 2);
     QPoint globalPoint = window.mapToGlobal(localPoint);
-    QWheelEvent event(localPoint, globalPoint, -120, Qt::NoButton, Qt::NoModifier, Qt::Vertical);
+    QWheelEvent event(localPoint, globalPoint, QPoint(0, 0), QPoint(0, -120),
+                      Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     event.setTimestamp(123456UL);
     event.setAccepted(false);
     QGuiApplication::sendEvent(&window, &event);