summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-07 13:06:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-07 13:06:42 (GMT)
commitf7dde050b1f4ef31bf386f447c723ffd497058c7 (patch)
tree2ee07f9dbe667c88c82ec75037fa5d74d2331c57
parent1dd89b6ad0546f247486b63f72035baf21475b51 (diff)
parent071088a8bd1bac104adfcb648cd81e6c020e4e69 (diff)
downloadQt-f7dde050b1f4ef31bf386f447c723ffd497058c7.zip
Qt-f7dde050b1f4ef31bf386f447c723ffd497058c7.tar.gz
Qt-f7dde050b1f4ef31bf386f447c723ffd497058c7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reset input context in Symbian when another window is opened.
-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 f057e0a..b513365 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -360,6 +360,11 @@ bool QCoeFepInputContext::symbianFilterEvent(QWidget *keyWidget, const QSymbianE
}
}
+ if (event->type() == QSymbianEvent::ResourceChangeEvent
+ && event->resourceChangeType() == KEikMessageFadeAllWindows) {
+ reset();
+ }
+
return false;
}