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
..
arch	PowerPC: Add detection of SPE (found on e500) and VSX	2016-06-19 18:46:26 +00:00
common	Fix issue causing pch configure test to always fail	2016-08-24 20:36:05 +00:00
mac/corewlan	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
qpa	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
unix	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-21 11:57:52 +02:00
win	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
x11	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00