summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-06-10 11:28:40 (GMT)
committeraxis <qt-info@nokia.com>2009-06-10 13:07:22 (GMT)
commit959ff46310b8a27c82ef6b0c1d122b817270f8d9 (patch)
tree581ee42f4dddb30d9936b55683ebfa2cab75d6be /src
parentc24d4cb9eca0b06f411bc99be3d232ff1ee27516 (diff)
downloadQt-959ff46310b8a27c82ef6b0c1d122b817270f8d9.zip
Qt-959ff46310b8a27c82ef6b0c1d122b817270f8d9.tar.gz
Qt-959ff46310b8a27c82ef6b0c1d122b817270f8d9.tar.bz2
Revert "Fix to qapplication::setActiveWindow autotest case in Symbian."
This reverts commit ba105741867dd96a9d58dcfcb78afef60e611bd6.
Diffstat (limited to 'src')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 1dfb012..24abb58 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -43,7 +43,6 @@
#include "qcoefepinputcontext_p.h"
#include <qapplication.h>
-#include <private/qapplication_p.h>
#include <qtextformat.h>
#include <fepitfr.h>
@@ -90,12 +89,9 @@ QCoeFepInputContext::~QCoeFepInputContext()
// This is to make sure that the FEP manager "forgets" about us,
// otherwise we may get callbacks even after we're destroyed.
// The call is asynchronous though, so we must spin the event loop
- // to make sure it gets detected. However we will not spin eventloop
- // in case that app is closing, since eventDispatcher is already deleted.
+ // to make sure it gets detected.
CCoeEnv::Static()->InputCapabilitiesChanged();
- if(!QApplicationPrivate::is_app_closing) {
- QApplication::processEvents();
- }
+ QApplication::processEvents();
if (m_fepState)
delete m_fepState;