Liang Qi a7e4b645dc Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/corelib/global/minimum-linux.S src/network/access/qhttpthreaddelegate.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8		2017-11-05 18:02:18 +01:00
..
access	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-05 18:02:18 +01:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-05 18:02:18 +01:00
socket	Merge remote-tracking branch 'origin/5.10' into dev	2017-09-26 16:14:54 +02:00
ssl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00