summaryrefslogtreecommitdiff
path: root/src/controls/Styles/Base
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:40 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:40 +0200
commit4b77b044b3e0a27f9f7501e6a78121afc270619c (patch)
treee73fbe5865c60494f3b3f847b7385e76d05e3804 /src/controls/Styles/Base
parentc24118685d6eb4cacf5f6af96215ba89ecc28604 (diff)
parenta2963fe162921c0abb2116aec6263204954030ad (diff)
downloadqtquickcontrols-4b77b044b3e0a27f9f7501e6a78121afc270619c.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
Diffstat (limited to 'src/controls/Styles/Base')
-rw-r--r--src/controls/Styles/Base/SliderStyle.qml5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index 8e4102c7..085fa56e 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -162,9 +162,12 @@ Style {
}
}
- /*! This property holds the tick mark labels
+ /*! This property holds the tick mark labels.
\since QtQuick.Controls.Styles 1.1
+ Every tickmark that should be drawn must be defined within this
+ component, so it is common to use a \l Repeater, for example.
+
You can access the handle width through the \c styleData.handleWidth property.
*/
property Component tickmarks: Repeater {