diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-17 07:06:14 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-17 07:06:14 (GMT) |
| commit | a4b37abd96860a5bc46f88205bb11706cbaec228 (patch) | |
| tree | 7181b9757b6f6083477cd9b3966b0b9f9163a77c /src/gui | |
| parent | 13ea38369b7f095e6af96c98bed7a3bb9bf795d5 (diff) | |
| parent | 57676c237992e0aa5a93a4e8fa66b3e7b90c2c90 (diff) | |
| download | Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.zip Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.tar.gz Qt-a4b37abd96860a5bc46f88205bb11706cbaec228.tar.bz2 | |
Merge branch '4.7' into qtquick11
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol_p.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index c7a3913..d108ad9 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -456,6 +456,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) #ifndef QT_NO_IM setPreeditArea(m_cursor, event->preeditString()); #endif //QT_NO_IM + const int oldPreeditCursor = m_preeditCursor; m_preeditCursor = event->preeditString().length(); m_hideCursor = false; QList<QTextLayout::FormatRange> formats; @@ -479,6 +480,8 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) updateDisplayText(/*force*/ true); if (cursorPositionChanged) emitCursorPositionChanged(); + else if (m_preeditCursor != oldPreeditCursor) + emit updateMicroFocus(); if (isGettingInput) finishChange(priorState); } diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h index bfe50fe..3c505c8 100644 --- a/src/gui/widgets/qlinecontrol_p.h +++ b/src/gui/widgets/qlinecontrol_p.h @@ -425,6 +425,7 @@ Q_SIGNALS: void textEdited(const QString &); void resetInputContext(); + void updateMicroFocus(); void accepted(); void editingFinished(); |