Liang Qi dd756011da Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f		2017-02-08 15:49:18 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
qplatformdefs.h	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00