diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 08:34:08 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 08:34:08 (GMT) |
| commit | 01f733a64e45363e74bea62e4cae8a658bc09383 (patch) | |
| tree | ea39b38552a063e7e10bd432b1155a7abae61620 /src/gui/styles/qcleanlooksstyle.cpp | |
| parent | fdf463ba74b2e00ba5f9db10f43585e8b15054f7 (diff) | |
| parent | b906feddf1593a837785bc41d65e837e64d31284 (diff) | |
| download | Qt-01f733a64e45363e74bea62e4cae8a658bc09383.zip Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.gz Qt-01f733a64e45363e74bea62e4cae8a658bc09383.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/styles/qcleanlooksstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcleanlooksstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 49dd47d..0f39b23 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -2069,7 +2069,7 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o // This is mainly to handle cases where someone sets the font on the window // and then the combo inherits it and passes it onward. At that point the resolve mask // is very, very weak. This makes it stonger. - font.setPointSizeF(menuItem->font.pointSizeF()); + font.setPointSizeF(QFontInfo(menuItem->font).pointSizeF()); if (menuitem->menuItemType == QStyleOptionMenuItem::DefaultItem) font.setBold(true); |