Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 16 Aug 2011 16:04:06 +0000 (02:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 16 Aug 2011 16:04:06 +0000 (02:04 +1000)
commitaf0749b1bf75f30eb956697fbe96bd75b80af031
treeb431e9dce6fa2cfe45d67abdb8fb9967beb6fd0f
parent1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1
parent18e60ed7e49c08ac216d7ee17a18f5af17333115
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/inputmethod/qcoefepinputcontext_s60.cpp