Liang Qi 5d5c00c676 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e		2018-12-04 09:58:43 +01:00
..
access	Merge remote-tracking branch 'origin/5.12' into dev	2018-12-04 09:58:43 +01: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	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-27 01:00:09 +01:00
ssl	Amend 7f77dc84fb to simplify the parameters of createPlainTestRows	2018-11-24 07:15:16 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00