summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstyle.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-18 00:37:52 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-18 00:37:52 (GMT)
commitd15888540f3b99c6add70106dda1dc1e262b8b00 (patch)
tree2e22581ed9fac85df0f24b68f4e6d3115163c31f /src/gui/styles/qstyle.cpp
parent247952ec74cede6a69c718ef039e00b21a877e56 (diff)
parent35f3438ae8a06aeba7b784df8de984d9d00aeff4 (diff)
downloadQt-d15888540f3b99c6add70106dda1dc1e262b8b00.zip
Qt-d15888540f3b99c6add70106dda1dc1e262b8b00.tar.gz
Qt-d15888540f3b99c6add70106dda1dc1e262b8b00.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/qstyle.cpp')
-rw-r--r--src/gui/styles/qstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 7ccac85..de4b5a3 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -1333,7 +1333,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value PM_LayoutVerticalSpacing Default \l{QLayout::spacing}{vertical spacing} for a QLayout.
\value PM_MaximumDragDistance The maximum allowed distance between
- the mouse and a slider when dragging. Exceeding the specified
+ the mouse and a scrollbar when dragging. Exceeding the specified
distance will cause the slider to jump back to the original
position; a value of -1 disables this behavior.