Liang Qi 40a1f69e86 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure.json mkspecs/macx-tvos-clang/qmake.conf mkspecs/macx-watchos-clang/qmake.conf Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c		2016-09-15 19:47:57 +02:00
..
mac	Make the Xcode generator recognize embedded frameworks/plugins	2016-08-31 22:42:32 +00:00
unix	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-15 19:47:57 +02:00
win32	qmake: remove unused #include	2016-09-09 18:16:45 +00:00
makefile.cpp	fix argument order in recursive qmake invocations	2016-08-25 11:55:32 +00:00
makefile.h	qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE	2016-08-15 22:16:59 +00:00
makefiledeps.cpp	Parse namespaces only for current file, add Q_NAMESPACE support to qmake	2016-09-06 10:29:21 +00: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	Updated license headers	2016-01-21 18:55:18 +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