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
..
images	Re-add systray.qdoc and images.	2015-09-11 07:47:31 +00:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00
dropsite.qdoc	Unify license header usage.	2016-03-29 10:20:03 +00:00
mousebuttons.qdoc	Unify license header usage.	2016-03-29 10:20:03 +00:00