projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
62e985f
)
Protect QTextControl::setTextCursor for existing preedit
author
Pekka Vuorela
<pekka.ta.vuorela@nokia.com>
Fri, 9 Dec 2011 13:30:26 +0000 (15:30 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 14 Dec 2011 14:02:45 +0000 (15:02 +0100)
Change-Id: I29fc7c472a3a20eeaf74e0dc411313e5750e9dee
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
src/quick/items/qquicktextcontrol.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquicktextcontrol.cpp
b/src/quick/items/qquicktextcontrol.cpp
index
436b6b7
..
8133087
100644
(file)
--- 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;