Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7
authorToby Tomkins <toby.tomkins@nokia.com>
Wed, 8 Jun 2011 12:11:14 +0000 (22:11 +1000)
committerToby Tomkins <toby.tomkins@nokia.com>
Wed, 8 Jun 2011 12:11:14 +0000 (22:11 +1000)
commit33db4e2533b3e4e07d37b651b65491195be403ab
tree1461e8762d3cb5868d3480fd61c2fff69f89b37c
parentc6a8f35846df86a87591372d022e54a701591f5b
parentea7576eecacaaf5e82f5ebaf847dc9690baa9fca
Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7
src/gui/inputmethod/qcoefepinputcontext_s60.cpp