Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8		2016-05-06 15:36:44 +02:00
..
access	Blacklisting autotests that fail on RHEL 7.1 also on RHEL 7.2	2016-04-15 05:57:02 +00:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02:00
socket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
ssl	Updated license headers	2016-01-21 18:55:18 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00