Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 6 Jul 2011 16:05:48 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 6 Jul 2011 16:05:48 +0000 (02:05 +1000)
commit8bc5a6319455d7dc0655a8c48862ada8890b0064
tree2f43d23e5a30e9f2c18698038291c74254db480a
parent013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f
parent156893a247f1c24094129b6f5151c8b821d8b1b5
Merge branch 4.7 into qt-4.8-from-4.7
src/corelib/global/qnamespace.qdoc
src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qhttpnetworkreply_p.h
src/network/access/qnetworkreplyimpl.cpp
src/plugins/graphicssystems/meego/qmeegographicssystem.cpp