Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Fri, 30 Dec 2011 12:28:05 +0000 (13:28 +0100)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Fri, 30 Dec 2011 12:28:05 +0000 (13:28 +0100)
commit1353abff11dd3a68884f9c6fd748dcb934383d79
tree0dcc25731cab6523c476cc64246151f8cf8f7c71
parent3a4f6f7884c9ea704890cd392bb5a211d2eb5701
parent5e3e9c5600e3089073990fd752e0eaa0336c6301
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
src/network/access/qnetworkaccesshttpbackend.cpp
src/gui/text/qtextengine.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp