Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7		2015-09-25 14:02:04 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
bearer	Add an option to skip the generic bearer engine	2015-09-22 14:06:30 +00:00
doc	QtNetwork documentation: Emphasize QTcpServer::addPendingConnection().	2015-09-21 16:42:34 +00:00
kernel	Mark QHostAddress relocatable	2015-09-22 22:47:19 +00:00
socket	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
ssl	Clean up some Apple-related includes and declarations.	2015-09-22 01:58:41 +00:00
network.pro	Android: New bearer plugin	2014-07-10 23:09:31 +02:00