Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +02:00
..
test.pro	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00