diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 00:50:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 00:50:24 (GMT) |
| commit | 5c43ab3fdc5c5bb8cf443560ffd5b48139a22a49 (patch) | |
| tree | c8e499f5810beaa6dc972a19d288ddd03af0162a /src/gui | |
| parent | b31b4c46e70401745572b808c916088afb839614 (diff) | |
| parent | 585ddb51909db49c51e9e8019d3b5d45c48a1a08 (diff) | |
| download | Qt-5c43ab3fdc5c5bb8cf443560ffd5b48139a22a49.zip Qt-5c43ab3fdc5c5bb8cf443560ffd5b48139a22a49.tar.gz Qt-5c43ab3fdc5c5bb8cf443560ffd5b48139a22a49.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Position the TextInput cursor correctly after IM text is commited.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index d108ad9..bffc2b5 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -420,7 +420,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) int c = m_cursor; // cursor position after insertion of commit string if (event->replacementStart() <= 0) - c += event->commitString().length() + qMin(-event->replacementStart(), event->replacementLength()); + c += event->commitString().length() - qMin(-event->replacementStart(), event->replacementLength()); m_cursor += event->replacementStart(); |