Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: Ide4b85626dd153b534c39a3afa2f3b9e732badf5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 8628f981..b358663d 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -545,10 +545,10 @@ void QQuickSlider::setHandle(QQuickItem *handle)
 qreal QQuickSlider::valueAt(qreal position) const
 {
     Q_D(const QQuickSlider);
-    const qreal value = d->from + (d->to - d->from) * position;
+    const qreal value = (d->to - d->from) * position;
     if (qFuzzyIsNull(d->stepSize))
-        return value;
-    return qRound(value / d->stepSize) * d->stepSize;
+        return d->from + value;
+    return d->from + qRound(value / d->stepSize) * d->stepSize;
 }
 
 /*!