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
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Fixed docs explaining the Frameworks usage	2017-01-06 12:42:24 +00:00
src	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-07 10:24:33 +02:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00