Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Aug 2011 16:03:30 +0000 (02:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Aug 2011 16:03:30 +0000 (02:03 +1000)
commit323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47
tree507963fe94cddf49d9632dd980e3478e8aae5109
parentaf0749b1bf75f30eb956697fbe96bd75b80af031
parente30e6e1502e33bf5d1b4d9536a17c9fac9866bbe
Merge branch 4.7 into qt-4.8-from-4.7
src/corelib/codecs/qtextcodec.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/widgets/qlinecontrol.cpp
tests/auto/qlineedit/tst_qlineedit.cpp