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
..
mac	Build Qt libraries with -fapplication-extension	2017-01-27 22:10:01 +00:00
unix	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
win32	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
makefile.cpp	don't pass qmake configure arguments to sub-projects	2017-01-06 20:09:18 +00:00
makefile.h	don't pass qmake configure arguments to sub-projects	2017-01-06 20:09:18 +00:00
makefiledeps.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
projectgenerator.h	Updated license headers	2016-01-21 18:55:18 +00:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00