diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
| commit | 7903979d3585b73adf3c2c2b88b5c94c303b8302 (patch) | |
| tree | 5e7b1b6ec6025778002f9312de7a14acf39011dc /src/imports/controls/doc/src | |
| parent | af9729ecf4434c5884cb61b990b819aaccd3af9b (diff) | |
| parent | 2202d79b39ff90eed19fb8106f79d4604e47acfd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/controls/data/tst_button.qml
Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
Diffstat (limited to 'src/imports/controls/doc/src')
| -rw-r--r-- | src/imports/controls/doc/src/includes/qquickswitch.qdocinc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc index 32ccbb89..985f85d9 100644 --- a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc +++ b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc @@ -2,7 +2,7 @@ This property holds the logical position of the thumb indicator. -The position is defined as a percentage of the indicator's size, scaled to +The position is expressed as a fraction of the indicator's size, in the range \c 0.0 - \c 1.0. The position can be used for example to determine whether the thumb has been dragged past the halfway point. For visualizing a thumb indicator, the right-to-left aware \l visualPosition should be used instead. @@ -16,7 +16,7 @@ indicator, the right-to-left aware \l visualPosition should be used instead. This property holds the visual position of the thumb indicator. -The position is defined as a percentage of the indicator's size, scaled to +The position is expressed as a fraction of the indicator's size, in the range \c 0.0 - \c 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 thumb indicator taking right-to-left support into account. |