Merge remote branch 'qt/master' into symbian-socket-engine
authorShane Kearns <shane.kearns@accenture.com>
Mon, 7 Feb 2011 17:20:33 +0000 (17:20 +0000)
committerShane Kearns <shane.kearns@accenture.com>
Mon, 7 Feb 2011 17:20:33 +0000 (17:20 +0000)
commit59a9938f91070ad3699fc6544848f0955ecf0bdd
tree99ad7312ddddf7233290115c7ea5daa3af0b83ec
parentb9307547c717606e08661cf474eeaf81cc0789e6
parent44298c848ac254fe1942eb32eed7651dec5bf0e3
Merge remote branch 'qt/master' into symbian-socket-engine

Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
31 files changed:
configure
src/corelib/io/qfilesystemengine.cpp
src/corelib/kernel/qcore_symbian_p.cpp
src/corelib/kernel/qcore_symbian_p.h
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/kernel/qeventdispatcher_symbian_p.h
src/network/access/qhttpnetworkrequest.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/bearer/qnetworksession.h
src/network/kernel/kernel.pri
src/network/kernel/qhostinfo_unix.cpp
src/network/kernel/qnetworkinterface_symbian.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qabstractsocket_p.h
src/network/socket/qabstractsocketengine.cpp
src/network/socket/qlocalserver.cpp
src/network/socket/qlocalserver_p.h
src/network/socket/qlocalsocket.cpp
src/network/socket/qlocalsocket_p.h
src/network/socket/qnativesocketengine.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
src/network/socket/qtcpserver.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.h
src/testlib/qabstracttestlogger.cpp
tests/auto/network.pro
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/configure/configureapp.cpp