diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
| commit | 4f2bb3e5a1ecbb1728209c7b2525c2c645ef49a2 (patch) | |
| tree | f3be806d0301078e69d3043c2ac1d370aca14825 /src/quicktemplates2/qquickdial.cpp | |
| parent | 170869fe1457fc68e96d46c9ff804071f86bd029 (diff) | |
| parent | 4ef7af98e69bf676dd39e6aad5e6a5f980648e75 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickslider.cpp
Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
Diffstat (limited to 'src/quicktemplates2/qquickdial.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickdial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 4c8576a7..9475cff7 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -283,8 +283,8 @@ void QQuickDial::setValue(qreal value) This property holds the logical position of the handle. - The position is defined as a percentage of the control's angle range (the - range within which the handle can be moved) scaled to \c {0.0 - 1.0}. + The position is expressed as a fraction of the control's angle range (the + range within which the handle can be moved) in the range \c {0.0 - 1.0}. Unlike the \l value property, the \c position is continuously updated while the handle is dragged. |