aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickrangeslider.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-28 03:01:34 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-28 03:01:34 +0200
commit012556df80470e294c1adaf1b442e1eb8729c598 (patch)
tree1871aaa41c9eaabd27b64d34458d02f85995f187 /src/quicktemplates2/qquickrangeslider.cpp
parent5df2972e560dab4a1778444dc1dbe0c95c86be21 (diff)
parentbc93333958e469e2bd79319befb23328a9de38a9 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
-rw-r--r--src/quicktemplates2/qquickrangeslider.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index e5c0766b..b06cb23c 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -807,7 +807,8 @@ qreal QQuickRangeSlider::valueAt(qreal position) const
\l {first.visualPosition}{visualPosition} should be used instead.
\row
\li pressed
- \li This property holds whether the first handle is pressed.
+ \li This property holds whether the first handle is pressed by either touch,
+ mouse, or keys.
\row
\li hovered
\li This property holds whether the first handle is hovered.
@@ -881,7 +882,8 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const
\l {second.visualPosition}{visualPosition} should be used instead.
\row
\li pressed
- \li This property holds whether the second handle is pressed.
+ \li This property holds whether the second handle is pressed by either touch,
+ mouse, or keys.
\row
\li hovered
\li This property holds whether the second handle is hovered.
@@ -938,6 +940,9 @@ void QQuickRangeSlider::setStepSize(qreal step)
This property holds the snap mode.
+ The snap mode determines how the slider handles behave with
+ regards to the \l stepSize.
+
Possible values:
\value RangeSlider.NoSnap The slider does not snap (default).
\value RangeSlider.SnapAlways The slider snaps while the handle is dragged.