summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-23 19:05:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-23 19:05:05 (GMT)
commitbab066cd455ef424ec75753273b1e0d4f3aae710 (patch)
treee851ff840b26cd73c8c4781c6acefd5c680dd65d /src
parent9b21487794b3984b5075f03e5639a8c4bf5f2813 (diff)
parent5c25cbaf75ab4d4f260b6da445980dec591aca92 (diff)
downloadQt-bab066cd455ef424ec75753273b1e0d4f3aae710.zip
Qt-bab066cd455ef424ec75753273b1e0d4f3aae710.tar.gz
Qt-bab066cd455ef424ec75753273b1e0d4f3aae710.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix documentmode tab label text on Mac OSX
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qmacstyle_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 78074c7..5bd939f 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3749,7 +3749,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
QPalette np = tab->palette;
np.setColor(QPalette::WindowText, QColor(255, 255, 255, 75));
QRect nr = subElementRect(SE_TabBarTabText, opt, w);
- nr.moveTop(+1);
+ nr.moveTop(-1);
int alignment = Qt::AlignCenter | Qt::TextShowMnemonic | Qt::TextHideMnemonic;
proxy()->drawItemText(p, nr, alignment, np, tab->state & State_Enabled,
tab->text, QPalette::WindowText);