Liang Qi f34e73a16a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb		2016-04-11 09:12:36 +02:00
..
configure	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-11 09:12:36 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00