Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

2 files changed, 5 insertions, 2 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 3110e63..6c47c7b 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -505,7 +505,6 @@ void QEventDispatcherSymbian::closingDown()
 
     delete m_wakeUpAO;
     if (m_activeScheduler) {
-        CActiveScheduler::Install(NULL);
         delete m_activeScheduler;
     }
 }
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index bf50383..1ae3d79 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -207,7 +207,11 @@ QString QCoeFepInputContext::language()
 
 bool QCoeFepInputContext::filterEvent(const QEvent *event)
 {
-    Q_ASSERT(focusWidget());
+    // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
+    // close when it discovers that the underlying widget does not have input capabilities.
+
+    if (!focusWidget())
+        return false;
 
     if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
         const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);