diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 23:59:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 23:59:48 (GMT) |
| commit | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (patch) | |
| tree | f272e4dad3301cfdc52e6d6fd3c6e342ecc0475f /src/gui | |
| parent | a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e (diff) | |
| parent | 9962e2d96a212c518054220167eb6f61e1052bcc (diff) | |
| download | Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.zip Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.tar.gz Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Autotest: to be sure, generate .cpp files with the proper headers too
Fix regression in clipped icon text on Windows
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
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); |