diff options
| author | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
| commit | 331522fdcbf14d757b61ed79dcc11649f62f28c8 (patch) | |
| tree | 57653fdd33e55e5093cc88ec8ff67e3fdfafc913 /src/gui/widgets | |
| parent | dd1a7c2186348157c4a255f56f280006c8d8c17d (diff) | |
| parent | 5ca6264933af60b3cd376b7f08bea008fa69b515 (diff) | |
| download | Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.zip Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.gz Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.bz2 | |
Merge branch 'variousFixes' into 4.7-s60
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 7f0c6c8..69e6791 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -419,7 +419,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) int c = m_cursor; // cursor position after insertion of commit string - if (event->replacementStart() == 0) + if (event->replacementStart() <= 0) c += event->commitString().length() + qMin(-event->replacementStart(), event->replacementLength()); m_cursor += event->replacementStart(); |