Liang Qi c7af193d2e Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/widgets/styles/qstyle_p.h Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09		2019-04-11 07:47:21 +02:00
..
access	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-11 07:47:21 +02:00
bearer	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00
kernel	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-10 08:16:20 +02:00
socket	Convert tst_qudpsocket to use docker	2019-03-06 16:05:05 +00:00
ssl	Merge remote-tracking branch 'origin/5.13' into dev	2019-03-31 12:39:42 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00