diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 21:46:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 21:46:22 (GMT) |
| commit | 5d2d21377bfb99ddb69a27a05b7baab93d411f35 (patch) | |
| tree | 1be0af8f72bb5989c94345e6bd420dd82443c869 /src/gui | |
| parent | 9bf12a037f96d85cef049305660a1ebd382c9c1e (diff) | |
| parent | c7833b8f5ecc7a47e35bdf9fbb528e1869979ef5 (diff) | |
| download | Qt-5d2d21377bfb99ddb69a27a05b7baab93d411f35.zip Qt-5d2d21377bfb99ddb69a27a05b7baab93d411f35.tar.gz Qt-5d2d21377bfb99ddb69a27a05b7baab93d411f35.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit cursorRectangle property.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 1a81394..bee4d95 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1950,6 +1950,7 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) if (isGettingInput) layout->setPreeditArea(cursor.position() - block.position(), e->preeditString()); QList<QTextLayout::FormatRange> overrides; + const int oldPreeditCursor = preeditCursor; preeditCursor = e->preeditString().length(); hideCursor = false; for (int i = 0; i < e->attributes().size(); ++i) { @@ -1970,6 +1971,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) } layout->setAdditionalFormats(overrides); cursor.endEditBlock(); + if (oldPreeditCursor != preeditCursor) + emit q->microFocusChanged(); } QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const |