gitorious.org Git - qt:qt.git/commit

author	Shane Kearns <shane.kearns@accenture.com>
	Mon, 7 Feb 2011 17:20:33 +0000 (17:20 +0000)
committer	Shane Kearns <shane.kearns@accenture.com>
	Mon, 7 Feb 2011 17:20:33 +0000 (17:20 +0000)
commit	59a9938f91070ad3699fc6544848f0955ecf0bdd
tree	99ad7312ddddf7233290115c7ea5daa3af0b83ec	tree \| snapshot
parent	b9307547c717606e08661cf474eeaf81cc0789e6	commit \| diff
parent	44298c848ac254fe1942eb32eed7651dec5bf0e3	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemengine.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_symbian_p.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_symbian_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_symbian_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkrequest.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessmanager.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworksession.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworksession.h	diff1 \|	diff2 \|	blob \| history
src/network/kernel/kernel.pri	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qhostinfo_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkinterface_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocket_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalserver.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalserver_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalsocket_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qtcpserver.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/symbian/qnetworksession_impl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/symbian/qnetworksession_impl.h	diff1 \|	diff2 \|	blob \| history
src/testlib/qabstracttestlogger.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/network.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/platformsocketengine/tst_platformsocketengine.cpp	diff1 \|	\|	blob \| history
tests/auto/qnetworkreply/tst_qnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
tools/configure/configureapp.cpp	diff1 \|	diff2 \|	blob \| history

6b46b7419a5aee9bd5fce67b7bfa8afe8e

RSS Atom

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