diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-04 03:30:09 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-04 03:30:09 (GMT) |
| commit | 8e9fa6284168d15d73d7779abb784f5ceb299026 (patch) | |
| tree | fdc96aea0a301af013bed644d71af03a49a085b3 /src/gui | |
| parent | 4c84020bd1c049ce82e0deb77196829616b91f4a (diff) | |
| parent | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (diff) | |
| download | Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.zip Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.tar.gz Qt-8e9fa6284168d15d73d7779abb784f5ceb299026.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-oslo2
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 739a70b..74d3ec3 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1608,7 +1608,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { pr.setHeight(pmSize.height() + 6); - tr.adjust(0, pr.height() - 1, 0, -3); + tr.adjust(0, pr.height() - 1, 0, -2); pr.translate(shiftX, shiftY); if (!hasArrow) { proxy()->drawItemPixmap(p, pr, Qt::AlignCenter, pm); |