Change-Id: I1d42a8804068718c7347b4f652289f9724c25a3c
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
q->setCursorVisible(hasFocus && scene && scene->hasFocus());
if(!hasFocus && control->passwordEchoEditing())
control->updatePasswordEchoEditing(false);//QWidgetLineControl sets it on key events, but doesn't deal with focus events
- if (!hasFocus)
+ if (!hasFocus) {
+ control->commitPreedit();
control->deselect();
+ }
QDeclarativeItemPrivate::focusChanged(hasFocus);
}
if (oldActiveFocusItem) {
#ifndef QT_NO_IM
- qApp->inputPanel()->commit();
+ qApp->inputPanel()->reset();
#endif
activeFocusItem = 0;
Q_ASSERT(oldActiveFocusItem);
#ifndef QT_NO_IM
- qApp->inputPanel()->commit();
+ qApp->inputPanel()->reset();
#endif
activeFocusItem = 0;
#endif
d->updatePasswordEchoEditing(false);//QQuickTextInputPrivate sets it on key events, but doesn't deal with focus events
}
- if (!hasFocus)
+
+ if (!hasFocus) {
+ d->commitPreedit();
d->deselect();
+ }
}
QQuickItem::itemChange(change, value);
}