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

Conflicts:
	src/quickcontrols2/qquickstyle.cpp
	src/quicktemplates2/qquickslider.cpp

Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 0b91d61d..d2d5da89 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l position property is defined as a percentage of the control's size,
-    scaled within the range \c {0.0 - 1.0}. The \l visualPosition property is
+    The \l position property is expressed as a fraction of the control's size,
+    in the range \c {0.0 - 1.0}. The \l visualPosition property is
     the same, except that it is reversed in a
     \l {Right-to-left User Interfaces}{right-to-left} application. The
     visualPosition is useful for positioning the handle when styling Slider.
@@ -259,8 +259,8 @@ void QQuickSlider::setValue(qreal value)
 
     This property holds the logical position of the handle.
 
-    The position is defined as a percentage of the control's size, scaled
-    to \c {0.0 - 1.0}. The \c position is continuously updated while the
+    The position is expressed as a fraction of the control's size, in the range
+    \c {0.0 - 1.0}. The \c position is continuously updated while the
     handle is dragged. For visualizing a slider, the right-to-left aware
     \l visualPosition should be used instead.
 
@@ -278,7 +278,7 @@ qreal QQuickSlider::position() const
 
     This property holds the visual position of the handle.
 
-    The position is defined as a percentage of the control's size, scaled to
+    The position is expressed as a fraction of the control's size, in the range
     \c {0.0 - 1.0}. When the control is \l {Control::mirrored}{mirrored}, the
     value is equal to \c {1.0 - position}. This makes the value suitable for
     visualizing the slider, taking right-to-left support into account.