Liang Qi 69ef0481fc Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867		2016-08-05 08:58:48 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-04 15:58:39 +02: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-05-19 12:55:27 +02:00
socket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00
ssl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00