Liang Qi a02863234d Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: configure mkspecs/common/wince/qplatformdefs.h src/plugins/platforms/directfb/qdirectfbbackingstore.cpp src/plugins/platforms/xcb/qxcbbackingstore.cpp Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c		2016-03-22 07:28:42 +01:00
..
configure	Merge remote-tracking branch 'origin/5.7' into dev	2016-03-22 07:28:42 +01:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00