diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-02-03 10:51:22 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-02-03 10:51:22 (GMT) |
| commit | b6f24329294dd96298e1785506b7dc95432186b9 (patch) | |
| tree | 02327aebe3e89f58837e463e80f109f627750d02 /src/gui/inputmethod/qcoefepinputcontext_s60.cpp | |
| parent | 56b910a838e93d849ec260f4c3db9a716beecdc0 (diff) | |
| parent | a9ffa944f8599db0559e9d07509a3778f49bbc2a (diff) | |
| download | Qt-b6f24329294dd96298e1785506b7dc95432186b9.zip Qt-b6f24329294dd96298e1785506b7dc95432186b9.tar.gz Qt-b6f24329294dd96298e1785506b7dc95432186b9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/inputmethod/qcoefepinputcontext_s60.cpp')
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 793bcde..e5ab300 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -101,11 +101,7 @@ QCoeFepInputContext::~QCoeFepInputContext() void QCoeFepInputContext::reset() { - commitTemporaryPreeditString(); - - CCoeFep* fep = CCoeEnv::Static()->Fep(); - if (fep) - fep->CancelTransaction(); + commitCurrentString(false); } void QCoeFepInputContext::ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateEvent aEventType) @@ -290,7 +286,6 @@ void QCoeFepInputContext::commitTemporaryPreeditString() return; commitCurrentString(false); - m_hasTempPreeditString = false; } void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event) @@ -765,6 +760,7 @@ void QCoeFepInputContext::commitCurrentString(bool triggeredBySymbian) m_preeditString.clear(); sendEvent(event); + m_hasTempPreeditString = false; m_longPress = 0; if (!triggeredBySymbian) { |