diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2010-02-03 13:07:35 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2010-02-03 13:08:02 (GMT) |
| commit | ca57a6e6bb48b468631576c3bd316f6c2b24e0dd (patch) | |
| tree | 38bcdcb1308322d4da66b9151399be1012073e70 | |
| parent | 1965885fe96eb50add6c0c9fc85a12497a6052bc (diff) | |
| download | Qt-ca57a6e6bb48b468631576c3bd316f6c2b24e0dd.zip Qt-ca57a6e6bb48b468631576c3bd316f6c2b24e0dd.tar.gz Qt-ca57a6e6bb48b468631576c3bd316f6c2b24e0dd.tar.bz2 | |
Compile fix for non-Symbian compilers
Putting the code for "case CT_ComboBox:" into {}
| -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: |