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
..
qsql	QSql tests: Remove Windows CE and clean up code.	2016-03-10 15:07:02 +00:00
qsqldatabase	Adding notification feature to SQLite driver	2016-04-21 10:56:24 +00:00
qsqldriver	QSql tests: Remove Windows CE and clean up code.	2016-03-10 15:07:02 +00:00
qsqlerror	Updated license headers	2016-01-21 18:55:18 +00:00
qsqlfield	Updated license headers	2016-01-21 18:55:18 +00:00
qsqlquery	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-21 11:57:52 +02:00
qsqlrecord	Updated license headers	2016-01-21 18:55:18 +00:00
qsqlresult	Updated license headers	2016-01-21 18:55:18 +00:00
qsqlthread	QSql tests: Remove Windows CE and clean up code.	2016-03-10 15:07:02 +00:00
kernel.pro	SQL: Change in QSqlResultPrivate::positionalToNamedBinding()	2012-12-10 21:23:35 +01:00