Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416		2018-11-10 11:38:40 +01:00
..
access	tst_qnetworkcookiejar: fix build for without topleveldomain	2018-08-24 12:25:40 +00:00
bearer	Make tests compile for Android	2018-06-25 08:01:19 +00:00
kernel	tst_qnetworkinterface: Fix for case of zero interface	2018-07-06 06:39:36 +00:00
socket	tst_QLocalSocket::processConnections: remove QSKIP	2018-10-25 11:51:48 +00:00
ssl	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-10 11:38:40 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00