Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a		2016-01-21 08:17:21 +01:00
..
access	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
bearer	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +01:00
socket	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
ssl	Make ephemeral server key available	2016-01-04 18:10:14 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00