Liang Qi 8e20daae9f Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/minimalegl/qminimaleglintegration.cpp Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56		2016-10-31 09:26:35 +01:00
..
images	New Qt logo	2014-11-05 08:10:42 +01:00
scripts	Doc: Update online documentation template	2015-08-26 09:45:55 +00:00
style	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-31 09:26:35 +01:00