Merge remote branch 'earth/master' into symbian-socket-engine
authorShane Kearns <shane.kearns@accenture.com>
Tue, 8 Mar 2011 16:04:05 +0000 (16:04 +0000)
committerShane Kearns <shane.kearns@accenture.com>
Tue, 8 Mar 2011 16:04:05 +0000 (16:04 +0000)
commitb6cc353adb0613ce41153181b4f08bb81b7acf68
tree1c25cc922c513f8666470695a0d63b8a19e223a4
parent5ef1fb5823a25cd4b27029701f7d707c82750acb
parent206b614f2e9623d792e6f398bf11765a44c272f5
Merge remote branch 'earth/master' into symbian-socket-engine

Conflicts:
src/corelib/kernel/qcore_symbian_p.h
src/network/kernel/qnetworkinterface_symbian.cpp
src/corelib/io/io.pri
src/corelib/kernel/qcore_symbian_p.cpp
src/corelib/kernel/qcore_symbian_p.h
src/network/kernel/qnetworkinterface_symbian.cpp
src/network/socket/qnativesocketengine.cpp
src/network/socket/qnativesocketengine_p.h
src/plugins/bearer/symbian/qnetworksession_impl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.h