diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-09 10:46:04 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-09 10:46:04 (GMT) |
| commit | de4954fd676c3bbf15abb9bedad4d09adc1c31b4 (patch) | |
| tree | b2ce67c3a485ff5201785f32df6a6105bf25f745 /src/gui/widgets | |
| parent | fc954a91625d172ef2dff4b5f9ea615551cb09bf (diff) | |
| parent | dc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff) | |
| download | Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.zip Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.tar.gz Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
Diffstat (limited to 'src/gui/widgets')
| -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(); |