Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/imports/controls/SpinBox.qml
	src/imports/controls/material/SpinBox.qml
	src/imports/controls/universal/SpinBox.qml
	tests/auto/controls/data/tst_swipedelegate.qml

Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5

1 files changed, 14 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 2932f4ce..7bfc0487 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -657,6 +657,20 @@ void QQuickDial::mouseUngrabEvent()
     setPressed(false);
 }
 
+void QQuickDial::wheelEvent(QWheelEvent *event)
+{
+    Q_D(QQuickDial);
+    QQuickControl::wheelEvent(event);
+    if (d->wheelEnabled) {
+        const qreal oldValue = d->value;
+        const QPointF angle = event->angleDelta();
+        const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep;
+        const qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize;
+        setValue(oldValue + step * delta);
+        event->setAccepted(!qFuzzyCompare(d->value, oldValue));
+    }
+}
+
 void QQuickDial::mirrorChange()
 {
     QQuickControl::mirrorChange();