Liang Qi e5ac4afbf9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/uikit/default_post.prf Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218		2016-11-17 14:43:26 +01:00
..
mac	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
unix	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00
win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01:00
makefile.cpp	qmake: fix file name treatment in emission of extra targets	2016-11-15 22:44:09 +00:00
makefile.h	qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE	2016-08-15 22:16:59 +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	qmake project generator: enable deprecation warnings	2016-10-26 10:44:56 +00: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