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

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

Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 5d5503e6..d8ada6f4 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
@@ -192,7 +192,7 @@ void QQuickProgressBar::setValue(qreal value)
 
     This property holds the logical position of the progress.
 
-    The position is defined as a percentage of the value, scaled to
+    The position is expressed as a fraction of the value, in the range
     \c {0.0 - 1.0}. For visualizing the progress, the right-to-left
     aware \l visualPosition should be used instead.
 
@@ -212,7 +212,7 @@ qreal QQuickProgressBar::position() const
 
     This property holds the visual position of the progress.
 
-    The position is defined as a percentage of the value, scaled to \c {0.0 - 1.0}.
+    The position is expressed as a fraction of the value, in the range \c {0.0 - 1.0}.
     When the control is \l {Control::mirrored}{mirrored}, \c visuaPosition is equal
     to \c {1.0 - position}. This makes \c visualPosition suitable for visualizing
     the progress, taking right-to-left support into account.