diff options
| author | Bill King <bking@trolltech.com> | 2010-01-12 02:45:42 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-01-12 02:45:42 (GMT) |
| commit | 7370dceadf969288a22c564728398cc7cb119d82 (patch) | |
| tree | ad966ec292aa7dbf98bdff4289603082478579b0 /src/gui/styles/qcleanlooksstyle.cpp | |
| parent | 82e9af930bea96710d7df87f03d3f4f1a175dbd3 (diff) | |
| parent | 7abb2cfdea14fa71aabcd79635aa8f407ed96186 (diff) | |
| download | Qt-7370dceadf969288a22c564728398cc7cb119d82.zip Qt-7370dceadf969288a22c564728398cc7cb119d82.tar.gz Qt-7370dceadf969288a22c564728398cc7cb119d82.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 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 b08847d..78beb5b 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); |