diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-14 10:59:38 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-14 10:59:38 (GMT) |
| commit | 2d01fb17dbf7590dd60987b08433252eb95f55e0 (patch) | |
| tree | 6beeb6c07bd64755c5f0ef0208e7002028709757 /src/gui/widgets/qcombobox.cpp | |
| parent | b19a64a407a9c69b0df7fd1b12f2f1377a6bc9c0 (diff) | |
| parent | af2b01c4571b468a57cb4e5e72dab481f6d88eb1 (diff) | |
| download | Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.zip Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.tar.gz Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 1ca878d..097f3d0 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -148,8 +148,10 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt menuOption.rect = option.rect; // Make sure fonts set on the combo box also overrides the font for the popup menu. - if (mCombo->testAttribute(Qt::WA_SetFont) || mCombo->testAttribute(Qt::WA_MacSmallSize) - || mCombo->testAttribute(Qt::WA_MacMiniSize)) + if (mCombo->testAttribute(Qt::WA_SetFont) + || mCombo->testAttribute(Qt::WA_MacSmallSize) + || mCombo->testAttribute(Qt::WA_MacMiniSize) + || mCombo->font() != qt_app_fonts_hash()->value("QComboBox", QFont())) menuOption.font = mCombo->font(); else menuOption.font = qt_app_fonts_hash()->value("QComboMenuItem", mCombo->font()); |