diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-21 21:48:39 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-21 21:48:39 +1000 |
| commit | ff4ad4409109c4c805f7d931c6b76095016618f4 (patch) | |
| tree | af2ca323fc5fc7aa302ea44bf62c15543b3891d0 | |
| parent | 37b8db7eee92d78d9205ea66ed0d0c55a9612bf3 (diff) | |
| parent | 5195c26208e9e2d80509c8308d590da2ef8a029b (diff) | |
| download | qt4-tools-ff4ad4409109c4c805f7d931c6b76095016618f4.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 66ab4c886d..eeec04bd28 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -164,7 +164,7 @@ void QCoeFepInputContext::reset() // text. if (m_cachedPreeditString.isEmpty() && !(currentHints & Qt::ImhNoPredictiveText)) { m_cachedPreeditString = m_preeditString; - if (focusWidget()) { + if (focusWidget() && !m_cachedPreeditString.isEmpty()) { int cursor = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt(); int anchor = focusWidget()->inputMethodQuery(Qt::ImAnchorPosition).toInt(); if (cursor == anchor) |