Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 16:06:44 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 16:06:44 +0000 (02:06 +1000)
commitb205fca78bcede0b2eefc8c0b12fed040e77eff1
treed2d836324535d5e9961be5e401dc47bde580750c
parent2bb185d5e65be09b4e1f73eadd0ab87f9d6aecbb
parentbfa6ac28c57d62f9add7fa27f029eac7f3835fab
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qtextcontrol.cpp
src/gui/widgets/qlinecontrol.cpp