diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-06-04 11:41:07 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-06-04 11:41:07 (GMT) |
| commit | 422905e301394dfd23b59a09ac9a725803ddf4e4 (patch) | |
| tree | 7dff8919ef42dc95833e2815a410bf3ba2d24c37 | |
| parent | d53a3282598b7bfa5c48627ffa0b04763cccfdf0 (diff) | |
| download | Qt-422905e301394dfd23b59a09ac9a725803ddf4e4.zip Qt-422905e301394dfd23b59a09ac9a725803ddf4e4.tar.gz Qt-422905e301394dfd23b59a09ac9a725803ddf4e4.tar.bz2 | |
S60Style: Buildbreak fix. Remove problematic #ifdef line.
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index e7ba1bb..83f5a6b 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2012,7 +2012,6 @@ 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 not defined (QT_NO_CALENDARWIDGET) && not defined (QT_NO_COMBOBOX) if (!(widget && qobject_cast<const QCalendarWidget *>(widget->parent())) || qobject_cast<const QComboBoxListView *>(widget)) { // no focus selection for touch @@ -2041,7 +2040,6 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti painter->restore(); } } -#endif //!QT_NO_CALENDARWIDGET && !QT_NO_COMBOBOX break; case PE_Widget: if (QS60StylePrivate::drawsOwnThemeBackground(widget) |