summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qcommonstyle.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-22 12:32:27 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-22 12:32:27 (GMT)
commitd001cef792b2f41615cb1f7657bed3d7525ffb0e (patch)
tree03ec9dc4a9a870d2b8902083d56431d8b4b54217 /src/gui/styles/qcommonstyle.cpp
parenta0fb8f874d0b8b8db5f50706a432bdb5a0294bf0 (diff)
parent1cfb5bcaa2cab142479ee975e25d9f605f852dad (diff)
downloadQt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.zip
Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.gz
Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/gui/styles/qcommonstyle.cpp')
-rw-r--r--src/gui/styles/qcommonstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 6972803..a46dbd7 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -1695,7 +1695,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
pr.setHeight(pmSize.height() + 6);
- tr.adjust(0, pr.height(), 0, -3);
+ tr.adjust(0, pr.height() - 1, 0, -3);
pr.translate(shiftX, shiftY);
if (!hasArrow) {
drawItemPixmap(p, pr, Qt::AlignCenter, pm);