diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
commit | 71314570d03631f50ab2c262011aba6a572d0ced (patch) | |
tree | 6d0c663ad313af89efff8e7b0fdafe6a28b19505 /src/controls/Slider.qml | |
parent | 3704a616dfabb71ebd3ffc64f8efe32931c82a8b (diff) | |
parent | ea099e341b5f8845be56f81b22e44a8b6cb227a2 (diff) | |
download | qtquickcontrols-71314570d03631f50ab2c262011aba6a572d0ced.tar.gz |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
Diffstat (limited to 'src/controls/Slider.qml')
-rw-r--r-- | src/controls/Slider.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 89c1e723..d0644b4c 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -167,6 +167,8 @@ Control { \l stepSize property. The default value is \c false. + + \note This property may be ignored on some platforms when using the native style (e.g. Android). */ property bool tickmarksEnabled: false |