diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 02:39:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 02:39:52 (GMT) |
| commit | bd202b822401989aa1abe3e2ad24344d71d6dfb3 (patch) | |
| tree | 07d04f48cf13c6f1f6b252642e2d71f57f3813d9 /src/gui/styles | |
| parent | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (diff) | |
| parent | deeb384ab6eec1a7db86c0eefafd19df6f7536a1 (diff) | |
| download | Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.zip Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.tar.gz Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index fc435e8..9025e5b 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2399,13 +2399,14 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin)); break; #ifndef QT_NO_COMBOBOX - case CT_ComboBox: - // Fixing Ui design issues with too wide QComboBoxes and greedy SizeHints - // Make sure, that the combobox says within the screen. - const QSize desktopContentSize = QApplication::desktop()->availableGeometry().size() - -QSize(pixelMetric(PM_LayoutLeftMargin) + pixelMetric(PM_LayoutRightMargin), 0); - sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget). - boundedTo(desktopContentSize); + case CT_ComboBox: { + // Fixing Ui design issues with too wide QComboBoxes and greedy SizeHints + // Make sure, that the combobox says within the screen. + const QSize desktopContentSize = QApplication::desktop()->availableGeometry().size() + -QSize(pixelMetric(PM_LayoutLeftMargin) + pixelMetric(PM_LayoutRightMargin), 0); + sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget). + boundedTo(desktopContentSize); + } break; #endif default: |