summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-04-04 08:39:58 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-04-04 08:39:58 (GMT)
commiteeb43433043dbcaa38177438cb6cba203fb01c96 (patch)
tree84d2846a88ce279ff227586ae51b0a5fea25a33b
parent64e640716204af69056c34ddac5ce26628a1edd2 (diff)
downloadQt-eeb43433043dbcaa38177438cb6cba203fb01c96.zip
Qt-eeb43433043dbcaa38177438cb6cba203fb01c96.tar.gz
Qt-eeb43433043dbcaa38177438cb6cba203fb01c96.tar.bz2
Native dialog softkeys are covered by QApplication softkeys
Dialog softkeys are covered by Qt Application's Softkeys Updating softkeys while showing a native dialog, pushes Qt application CBA on top of dialog CBA. Therefore, native dialog can not be dismissed. As a workaround, when gaining focus to a window, do not update application softkeys, if there is a native dialog shown. Task-number: QTBUG-18486 Reviewed-by: mread
-rw-r--r--src/gui/kernel/qapplication_s60.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 1856ead..21b50b6 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -2198,7 +2198,8 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
}
#endif
#ifdef QT_SOFTKEYS_ENABLED
- QSoftKeyManager::updateSoftKeys();
+ if (!CEikonEnv::Static()->EikAppUi()->IsDisplayingMenuOrDialog())
+ QSoftKeyManager::updateSoftKeys();
#endif
break;
case EEventFocusLost: