aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2011-12-09 15:30:26 +0200
committerQt by Nokia <qt-info@nokia.com>2011-12-14 15:02:45 +0100
commit9dfebdb6c51aa217ae83bb2bae09bd6411a2079f (patch)
tree48c987168e6b82ff475909e07b33dcc6b38f8f77 /src/quick/items
parent62e985fee601d526fe384b2b18db58eac777009f (diff)
Protect QTextControl::setTextCursor for existing preedit
Change-Id: I29fc7c472a3a20eeaf74e0dc411313e5750e9dee Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquicktextcontrol.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 436b6b7ae9..81330878dd 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -827,6 +827,7 @@ QTextDocument *QQuickTextControl::document() const
void QQuickTextControl::setTextCursor(const QTextCursor &cursor)
{
Q_D(QQuickTextControl);
+ d->commitPreedit();
d->cursorIsFocusIndicator = false;
const bool posChanged = cursor.position() != d->cursor.position();
const QTextCursor oldSelection = d->cursor;