diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
| commit | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (patch) | |
| tree | ae1d621e9933d88e22f03e28dfea671a3a272ab1 /src/gui/widgets/qlinecontrol.cpp | |
| parent | 4e5a1a77677540422cc69ec5c2b1341ca4b318f9 (diff) | |
| parent | 05eeb454e0fcc83db330ee7df33a800a6998fc30 (diff) | |
| download | Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.zip Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.gz Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/widgets/qlinecontrol.cpp')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |