diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-11-03 14:05:30 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-11-03 14:05:30 (GMT) |
| commit | 33489bcf46d681caba6cf107a79593302d48b1db (patch) | |
| tree | c0584dab7aab1db2baf416520dd62b9789e8e2dc | |
| parent | 03c5d276c6ffc16c43ac554aa2e22b5824c35c95 (diff) | |
| parent | 381247326743888075979664f50ea804d6123c42 (diff) | |
| download | Qt-33489bcf46d681caba6cf107a79593302d48b1db.zip Qt-33489bcf46d681caba6cf107a79593302d48b1db.tar.gz Qt-33489bcf46d681caba6cf107a79593302d48b1db.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 3f6545c..9497b6f 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1831,7 +1831,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) e->ignore(); return; } - bool isGettingInput = !e->commitString().isEmpty() || !e->preeditString().isEmpty() + bool isGettingInput = !e->commitString().isEmpty() + || e->preeditString() != cursor.block().layout()->preeditAreaText() || e->replacementLength() > 0; if (isGettingInput) { diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 8f17e98..0fc94c9 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -401,7 +401,8 @@ void QLineControl::moveCursor(int pos, bool mark) void QLineControl::processInputMethodEvent(QInputMethodEvent *event) { int priorState = 0; - bool isGettingInput = !event->commitString().isEmpty() || !event->preeditString().isEmpty() + bool isGettingInput = !event->commitString().isEmpty() + || event->preeditString() != preeditAreaText() || event->replacementLength() > 0; bool cursorPositionChanged = false; |