diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-15 21:29:19 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-15 21:29:19 (GMT) |
| commit | de3e3d6bff2b585524cd504cf052cf181a6c2eae (patch) | |
| tree | cb90c818ab258856cafb447fcb587d29ff24e2be | |
| parent | 5bfdd295496e412ccb5777adb58eec847e8b51ba (diff) | |
| download | Qt-de3e3d6bff2b585524cd504cf052cf181a6c2eae.zip Qt-de3e3d6bff2b585524cd504cf052cf181a6c2eae.tar.gz Qt-de3e3d6bff2b585524cd504cf052cf181a6c2eae.tar.bz2 | |
Fix commit 82e19a10f13005a327b134999315ecf39d5d70e3
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 29827b7..d2bd679 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2038,12 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti #endif //QT_NO_SPINBOX case PE_FrameFocusRect: // Calendar widget and combox both do not use styled itemDelegate - if (!(false + if (widget && !(false #ifndef QT_NO_CALENDARWIDGET - || (widget && qobject_cast<const QCalendarWidget *>(widget->parent())) + || qobject_cast<const QCalendarWidget *>(widget->parent()) #endif //QT_NO_CALENDARWIDGET #ifndef QT_NO_COMBOBOX - || (qobject_cast<const QComboBoxListView *>(widget)) + || qobject_cast<const QComboBoxListView *>(widget) #endif //QT_NO_COMBOBOX )) { // no focus selection for touch @@ -2322,7 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w break; case SH_UnderlineShortcut: retValue = 0; - break; + break; default: break; } |