diff options
| author | axis <qt-info@nokia.com> | 2009-10-27 08:32:25 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-27 08:32:25 (GMT) |
| commit | 51bfafed59d77b791f0266fa1bfc36634597c5c4 (patch) | |
| tree | 630d9fbc5aad375950b03d80cf775c228f31a741 /src/gui/widgets/qcombobox.cpp | |
| parent | cb3a2633bb9d8a0e949c403d0f0631caef254599 (diff) | |
| parent | 5a4909d9f87b9abf471908a085c0e9f31b7e0a50 (diff) | |
| download | Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.zip Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.tar.gz Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 4f2e91b..ae56d36 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -314,7 +314,7 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const // height - sh.setHeight(qMax(fm.lineSpacing(), 14) + 2); + sh.setHeight(qMax(fm.height(), 14) + 2); if (hasIcon) { sh.setHeight(qMax(sh.height(), iconSize.height() + 2)); } |