diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-16 07:59:00 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-16 07:59:00 (GMT) |
| commit | 9fbf1387b04ec1dab0772956457fdbf1c0e508f2 (patch) | |
| tree | 260c1be4a3ec65da10141ed931e2fa71ade90af5 /src | |
| parent | 02f0cc5c834c0c45a6191f5f4f3c8c4c1b21d70e (diff) | |
| parent | df299de9748adb2cdb21834956907076971ff45d (diff) | |
| download | Qt-9fbf1387b04ec1dab0772956457fdbf1c0e508f2.zip Qt-9fbf1387b04ec1dab0772956457fdbf1c0e508f2.tar.gz Qt-9fbf1387b04ec1dab0772956457fdbf1c0e508f2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index d9ef8ef..d2bd679 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2038,16 +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 ( widget && ( + if (widget && !(false #ifndef QT_NO_CALENDARWIDGET - (qobject_cast<const QCalendarWidget *>(widget->parent())) -#else - false + || qobject_cast<const QCalendarWidget *>(widget->parent()) #endif //QT_NO_CALENDARWIDGET #ifndef QT_NO_COMBOBOX - || (qobject_cast<const QComboBoxListView *>(widget)) -#else - || false + || qobject_cast<const QComboBoxListView *>(widget) #endif //QT_NO_COMBOBOX )) { // no focus selection for touch @@ -2326,6 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w break; case SH_UnderlineShortcut: retValue = 0; + break; default: break; } |