diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:02:01 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:02:01 (GMT) |
| commit | 3945fd75a93d790434b33c2d23add155893a82a4 (patch) | |
| tree | e83166a337857381d1c152d0bb9c0f1c5d101efc /src/gui/styles | |
| parent | f7e13aefc24b98299d8fd44cad60cc13b16e4114 (diff) | |
| parent | aa863c61ec5e68ff73c02e25a2954cdba9c2ef15 (diff) | |
| download | Qt-3945fd75a93d790434b33c2d23add155893a82a4.zip Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.gz Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/itemviews/qheaderview.cpp
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qplastiquestyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index 5052755..ce2109a 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -3309,7 +3309,7 @@ void QPlastiqueStyle::drawControl(ControlElement element, const QStyleOption *op // Draw the text centered QFont font = painter->font(); - font.setPointSize(font.pointSize() - 1); + font.setPointSize(QFontInfo(font).pointSize() - 1); painter->setFont(font); painter->setPen(dockWidget->palette.windowText().color()); painter->drawText(titleRect, |