summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qslider.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-06-16 10:32:05 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-06-16 10:32:05 (GMT)
commit39d357505c7de6430f73cd5a491c2a7ddccd55ea (patch)
treea1dd8a773bdd1f685945c4c761a7bad1c9823460 /src/gui/widgets/qslider.cpp
parent59ec66675b725f56111e4b133e79828bc6d5d95a (diff)
parent4ae3fd65f5f832a2b6a7463eb758cc0a5819ad9d (diff)
downloadQt-39d357505c7de6430f73cd5a491c2a7ddccd55ea.zip
Qt-39d357505c7de6430f73cd5a491c2a7ddccd55ea.tar.gz
Qt-39d357505c7de6430f73cd5a491c2a7ddccd55ea.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/widgets/qslider.cpp')
-rw-r--r--src/gui/widgets/qslider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qslider.cpp b/src/gui/widgets/qslider.cpp
index a5e62cf..5755202 100644
--- a/src/gui/widgets/qslider.cpp
+++ b/src/gui/widgets/qslider.cpp
@@ -621,7 +621,7 @@ QSlider::TickPosition QSlider::tickPosition() const
\brief the interval between tickmarks
This is a value interval, not a pixel interval. If it is 0, the
- slider will choose between lineStep() and pageStep().
+ slider will choose between singleStep() and pageStep().
The default value is 0.