diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:18:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:19:21 +0200 |
| commit | 14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch) | |
| tree | 47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42 /src/imports/controls/doc/src/includes/qquickswitch.qdocinc | |
| parent | 2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff) | |
| parent | ceaf6177a8be6db22e629ff05a625e278025b071 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Comparing colors in tst_material.qml works fine now.
Conflicts:
examples/quickcontrols2/gallery/qtquickcontrols2.conf
tests/auto/material/data/tst_material.qml
Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
Diffstat (limited to 'src/imports/controls/doc/src/includes/qquickswitch.qdocinc')
| -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 aee93a26..32ccbb89 100644 --- a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc +++ b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc @@ -4,7 +4,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 \c 0.0 - \c 1.0. The position can be used for example to determine whether -the thumb has been dragged past the halfway. For visualizing a thumb +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. \sa visualPosition @@ -21,7 +21,7 @@ The position is defined as a percentage of the indicator's size, scaled to 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. In order to for example determine whether the thumb has been dragged past -the halfway, the logical \l position should be used instead. +the halfway point, the logical \l position should be used instead. \sa position |