summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-06-08 22:11:14 +1000
committerToby Tomkins <toby.tomkins@nokia.com>2011-06-08 22:11:14 +1000
commit33db4e2533b3e4e07d37b651b65491195be403ab (patch)
tree1461e8762d3cb5868d3480fd61c2fff69f89b37c /src/gui/inputmethod
parentc6a8f35846df86a87591372d022e54a701591f5b (diff)
parentea7576eecacaaf5e82f5ebaf847dc9690baa9fca (diff)
Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/inputmethod')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 34075029c3..9b5e917829 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -365,6 +365,11 @@ bool QCoeFepInputContext::symbianFilterEvent(QWidget *keyWidget, const QSymbianE
}
}
+ if (event->type() == QSymbianEvent::ResourceChangeEvent
+ && event->resourceChangeType() == KEikMessageFadeAllWindows) {
+ reset();
+ }
+
return false;
}