Merge "Merge dev into 5.14 (delayed final downmerge)"

2 files changed, 2 insertions, 2 deletions

diff --git a/examples/datavisualization/texturesurface/custominputhandler.cpp b/examples/datavisualization/texturesurface/custominputhandler.cpp
index 07608c90..e8e693a0 100644
--- a/examples/datavisualization/texturesurface/custominputhandler.cpp
+++ b/examples/datavisualization/texturesurface/custominputhandler.cpp
@@ -58,7 +58,7 @@ void CustomInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mouse
 //! [1]
 void CustomInputHandler::wheelEvent(QWheelEvent *event)
 {
-    float delta = float(event->delta());
+    float delta = float(event->angleDelta().y());
 
     m_axisXMinValue += delta;
     m_axisXMaxValue -= delta;
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 5e6f10af..3d5dd059 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -262,7 +262,7 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
         zoomLevel = qBound(minZoomLevel, zoomLevel, maxZoomLevel);
 
         if (isZoomAtTargetEnabled()) {
-            scene()->setGraphPositionQuery(event->pos());
+            scene()->setGraphPositionQuery(event->position().toPoint());
             d_ptr->m_zoomAtTargetPending = true;
             // If zoom at target is enabled, we don't want to zoom yet, as that causes
             // jitter. Instead, we zoom next frame, when we apply the camera position.