Liang Qi 5d6073be27 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775		2017-04-07 10:24:33 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-07 10:24:33 +02:00
qplatformdefs.h	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00