diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 16:43:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 16:43:48 (GMT) |
| commit | 970732a4597a7398740bd3d716c3fa967f810cac (patch) | |
| tree | 54cb8a122568a6faf81fe4de58ac7e985d216c7e | |
| parent | 8a3b4e1e66fb7cdcf1a5aa518e1cc31eaba72236 (diff) | |
| parent | 7acf2417bd2ae17c2e3c289c7caed84219e5fecd (diff) | |
| download | Qt-970732a4597a7398740bd3d716c3fa967f810cac.zip Qt-970732a4597a7398740bd3d716c3fa967f810cac.tar.gz Qt-970732a4597a7398740bd3d716c3fa967f810cac.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix last character being overwritten in password field
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index d081cfd..999edda 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -294,6 +294,10 @@ void QCoeFepInputContext::commitTemporaryPreeditString() return; commitCurrentString(false); + + //update cursor position, now this pre-edit text has been committed. + //this prevents next keypress overwriting it (QTBUG-11673) + m_cursorPos = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt(); } void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event) |