diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-03-29 12:26:18 +0300 |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-03-29 12:26:18 +0300 |
| commit | 32dcbc38ef2332bd93d66782eae2de5020e998b4 (patch) | |
| tree | d367ea12c5cbf2f3b55420e2419e04b4cba1d90b /src/gui/inputmethod | |
| parent | 4f8d4492b8cafcdef71b5b40482c1eddb23062ab (diff) | |
| parent | 85360044130a13f7041e5291334423ad0b180cb3 (diff) | |
Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-requests/2584
Diffstat (limited to 'src/gui/inputmethod')
| -rw-r--r-- | src/gui/inputmethod/qinputcontext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp index 063aefd652..f083e51981 100644 --- a/src/gui/inputmethod/qinputcontext.cpp +++ b/src/gui/inputmethod/qinputcontext.cpp @@ -355,9 +355,10 @@ void QInputContext::widgetDestroyed(QWidget *widget) in complex input method. In the case, call QInputContext::reset() to ensure proper termination of inputting. - You must not send any QInputMethodEvent except empty InputMethodEnd event using - QInputContext::reset() at reimplemented reset(). It will break - input state consistency. + In a reimplementation of reset(), you must not send any + QInputMethodEvent containing preedit text. You can only commit + string and attributes; otherwise, you risk breaking input state + consistency. */ |