From 422905e301394dfd23b59a09ac9a725803ddf4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Meril=C3=A4?= <sami.merila@nokia.com>
Date: Thu, 4 Jun 2009 14:41:07 +0300
Subject: S60Style: Buildbreak fix. Remove problematic #ifdef line.

---
 src/gui/styles/qs60style.cpp | 2 --
 1 file changed, 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)
-- 
cgit v0.12