diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 16:06:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 16:06:44 (GMT) |
| commit | b205fca78bcede0b2eefc8c0b12fed040e77eff1 (patch) | |
| tree | d2d836324535d5e9961be5e401dc47bde580750c /src/gui/widgets | |
| parent | 2bb185d5e65be09b4e1f73eadd0ab87f9d6aecbb (diff) | |
| parent | bfa6ac28c57d62f9add7fa27f029eac7f3835fab (diff) | |
| download | Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.zip Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.gz Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 4fb0f0c..e530222 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -435,6 +435,8 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) c += event->commitString().length() - qMin(-event->replacementStart(), event->replacementLength()); m_cursor += event->replacementStart(); + if (m_cursor < 0) + m_cursor = 0; // insert commit string if (event->replacementLength()) { @@ -447,7 +449,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) cursorPositionChanged = true; } - m_cursor = qMin(c, m_text.length()); + m_cursor = qBound(0, c, m_text.length()); for (int i = 0; i < event->attributes().size(); ++i) { const QInputMethodEvent::Attribute &a = event->attributes().at(i); |