Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 16:04:01 +0000 (02:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 16:04:01 +0000 (02:04 +1000)
commit4e40c388aef3cb16a1492764c37ae8ba929e8aef
tree986d1b97560672a84e9c6f746956df994e700c8f
parent323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47
parentc3000295bfbacbc853bcd5cd2b9cbc2784722093
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/inputmethod/qcoefepinputcontext_s60.cpp