Merge branch 'symbian-socket-engine' into staging-master
authorShane Kearns <shane.kearns@accenture.com>
Tue, 10 May 2011 09:23:30 +0000 (10:23 +0100)
committerShane Kearns <shane.kearns@accenture.com>
Tue, 10 May 2011 09:23:30 +0000 (10:23 +0100)
commite81ba9b802d6a5439b672c847aa9741cf3229227
treeebb7f1e5dbd83279ee60e51be9884a4e57122138
parente75796dfa58652ec8998227d9f547eea990a0353
parent19edac88af53eea7f733cabbaee77f9b725b7ea9
Merge branch 'symbian-socket-engine' into staging-master
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/socket/qabstractsocket.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp