diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 17:26:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 17:26:07 (GMT) |
| commit | 9bf12a037f96d85cef049305660a1ebd382c9c1e (patch) | |
| tree | 65439d78cdcb968c919ca8dd78d02af7c1ed87d6 /src/gui | |
| parent | ba3dd5c9c0aed851e4f1ee829c827f8d3bfbd5b3 (diff) | |
| parent | cc526edbff1cc413532f7ab1b6c088adae76744d (diff) | |
| download | Qt-9bf12a037f96d85cef049305660a1ebd382c9c1e.zip Qt-9bf12a037f96d85cef049305660a1ebd382c9c1e.tar.gz Qt-9bf12a037f96d85cef049305660a1ebd382c9c1e.tar.bz2 | |
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:
Fix to 'QImage convertToFormat doesn't work correctly'
Predictive Text causing app to crash after repeated edit attempts
Diffstat (limited to 'src/gui')
| -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 868565d..8574f2c 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -231,7 +231,7 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event) // It ignores the mouse event, so we need to commit and send a selection event (which will get triggered // after the commit) if (!m_preeditString.isEmpty()) { - commitCurrentString(false); + commitCurrentString(true); int pos = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt(); |