diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 10:29:27 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 11:28:00 +0300 |
commit | 6d93bcf549939f423baca589c7928e8d29b68e48 (patch) | |
tree | efdd34971e325156dc193047153c614a7ea661b5 | |
parent | 7bd8bf6cf8cf6b1f00085c27fd03fbe93010c670 (diff) | |
parent | 57ba04b0f08fc2ae8654ad9aa7986e25edb4c2c3 (diff) |
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have
been pushed on 2019-08-27 as the final down-merge from dev to 5.14.
Task-number: QTBUG-78019
Change-Id: I9e1685238ec1d8450c8d0a5e8894f4d38407dd54
-rw-r--r-- | examples/datavisualization/texturesurface/custominputhandler.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/input/q3dinputhandler.cpp | 2 |
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. |