Liang Qi 7555a92581 Merge remote-tracking branch 'origin/5.7' into 5.8 ... 5971b88e is not needed in new configure. This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with apple SDK", 2c9d15d7, because it breaks iOS build with new configure system. Conflicts: mkspecs/features/default_pre.prf mkspecs/features/mac/toolchain.prf mkspecs/features/toolchain.prf src/dbus/qdbusconnection.cpp src/plugins/sqldrivers/mysql/qsql_mysql.cpp src/sql/drivers/mysql/qsql_mysql.cpp src/widgets/widgets/qmenubar.cpp src/widgets/widgets/qmenubar_p.h tools/configure/configureapp.cpp tools/configure/environment.cpp tools/configure/environment.h Change-Id: I995533dd334211ebd25912db05b639d6f908aaec		2016-09-21 11:57:52 +02:00
..
mac	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-21 11:57:52 +02:00
unix	Enable precompiled headers on iOS, tvOS, watchOS	2016-09-02 08:25:31 +00: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