diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 23:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 23:00:14 (GMT) |
| commit | 34ad8bd00efbc4f76066826f068b3d7bff0152c0 (patch) | |
| tree | da24f8987e5e26d85024fe2b5e7342625bd04e78 /src/gui/widgets | |
| parent | 1e8479b2aa781e6ce3fadf01294023fbc6ddbc22 (diff) | |
| parent | 95e5e8ff45d2aa8acda595186136b54f695bb9cb (diff) | |
| download | Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.zip Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.tar.gz Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index d58da37..0af2e59 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -445,6 +445,8 @@ void QLineControl::moveCursor(int pos, bool mark) void QLineControl::processInputMethodEvent(QInputMethodEvent *event) { int priorState = 0; + int originalSelectionStart = m_selstart; + int originalSelectionEnd = m_selend; bool isGettingInput = !event->commitString().isEmpty() || event->preeditString() != preeditAreaText() || event->replacementLength() > 0; @@ -523,6 +525,8 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) } m_textLayout.setAdditionalFormats(formats); updateDisplayText(/*force*/ true); + if (originalSelectionStart != m_selstart || originalSelectionEnd != m_selend) + emit selectionChanged(); if (cursorPositionChanged) emitCursorPositionChanged(); else if (m_preeditCursor != oldPreeditCursor) |