summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-06-15 17:40:18 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-06-15 17:40:18 (GMT)
commit82e19a10f13005a327b134999315ecf39d5d70e3 (patch)
tree947879e968b202fd78eca36cf005b1a536c69b9c /src
parent40c70459b40e4e54c2cf515f502824c8d191626b (diff)
downloadQt-82e19a10f13005a327b134999315ecf39d5d70e3.zip
Qt-82e19a10f13005a327b134999315ecf39d5d70e3.tar.gz
Qt-82e19a10f13005a327b134999315ecf39d5d70e3.tar.bz2
Fix for Task #256174
Bring back the keyPad Navigation focus visualization. It disappeared with commit e0690577327097ec3d9be99205bfcf01f8404d23
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qs60style.cpp9
1 files 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;
}