From 82e19a10f13005a327b134999315ecf39d5d70e3 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Mon, 15 Jun 2009 19:40:18 +0200
Subject: Fix for Task #256174

Bring back the keyPad Navigation focus visualization. It disappeared
with commit e0690577327097ec3d9be99205bfcf01f8404d23
---
 src/gui/styles/qs60style.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index c6118d6..1292092 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 (!(false
 #ifndef QT_NO_CALENDARWIDGET
-             (qobject_cast<const QCalendarWidget *>(widget->parent()))
-#else
-             false
+            || (widget && qobject_cast<const QCalendarWidget *>(widget->parent()))
 #endif //QT_NO_CALENDARWIDGET
 #ifndef QT_NO_COMBOBOX
             || (qobject_cast<const QComboBoxListView *>(widget))
-#else
-            || false
 #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;
     }
-- 
cgit v0.12