diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 20:49:55 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 20:49:55 +0100 |
| commit | 24270550463fbc81c7725595719e6e21eade2819 (patch) | |
| tree | 4e7c118ed3c4b42e43403960365a2672441ea05e /src/gui/inputmethod | |
| parent | 4376f8871b4422830e9ffb7f3acbc29766d8d218 (diff) | |
| parent | 444fb94e02308bedc7b37a702adb95b740168a94 (diff) | |
| download | qt4-tools-24270550463fbc81c7725595719e6e21eade2819.tar.gz | |
Merge branch '4.6'
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
Diffstat (limited to 'src/gui/inputmethod')
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index a295d662db..1bf76624e4 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -139,8 +139,7 @@ void QCoeFepInputContext::widgetDestroyed(QWidget *w) // Make sure that the input capabilities of whatever new widget got focused are queried. CCoeControl *ctrl = w->effectiveWinId(); if (ctrl->IsFocused()) { - ctrl->SetFocus(false); - ctrl->SetFocus(true); + queueInputCapabilitiesChanged(); } } |