diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-28 03:01:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-28 03:01:34 +0200 |
commit | 012556df80470e294c1adaf1b442e1eb8729c598 (patch) | |
tree | 1871aaa41c9eaabd27b64d34458d02f85995f187 /src/quicktemplates2/qquickslider.cpp | |
parent | 5df2972e560dab4a1778444dc1dbe0c95c86be21 (diff) | |
parent | bc93333958e469e2bd79319befb23328a9de38a9 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6d731149b21d02164220f6cdc485d9e4ae31bd13
Diffstat (limited to 'src/quicktemplates2/qquickslider.cpp')
-rw-r--r-- | src/quicktemplates2/qquickslider.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 406199c9..1e6e0c25 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -448,6 +448,9 @@ void QQuickSlider::setStepSize(qreal step) This property holds the snap mode. + The snap mode determines how the slider handle behaves with + regards to the \l stepSize. + Possible values: \value Slider.NoSnap The slider does not snap (default). \value Slider.SnapAlways The slider snaps while the handle is dragged. @@ -486,7 +489,8 @@ void QQuickSlider::setSnapMode(SnapMode mode) /*! \qmlproperty bool QtQuick.Controls::Slider::pressed - This property holds whether the slider is pressed. + This property holds whether the slider is pressed by either touch, mouse, + or keys. */ bool QQuickSlider::isPressed() const { |