Merge branch 4.7 into qt-4.8-from-4.7
authorSergio Ahumada <sergio.ahumada@nokia.com>
Tue, 15 Nov 2011 15:32:31 +0000 (16:32 +0100)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Tue, 15 Nov 2011 15:32:31 +0000 (16:32 +0100)
commit22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f
treebcfc42bd2c2b813b32e1ace72ea1182fae634209
parent8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5
parentf86ca84e783c34e701f3742902161cb365e6e940
Merge branch 4.7 into qt-4.8-from-4.7
src/corelib/kernel/qtranslator.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/network/access/qhttpnetworkreply.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp