Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9		2017-11-23 09:36:03 +01:00
..
qsql	tst_qsql.cpp: Remove deprecated module include	2016-11-25 09:55:21 +00:00
qsqldatabase	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-30 08:54:05 +01:00
qsqldriver	OCI: Match the constraints on the index_name column	2017-11-15 06:40:45 +00:00
qsqlerror	Add move special member functions to QSqlError	2017-04-28 12:50:34 +00:00
qsqlfield	QSqlField: Add a means to see what the tablename is for a given field	2017-07-12 09:01:50 +00:00
qsqlquery	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qsqlrecord	QSqlField: Add a means to see what the tablename is for a given field	2017-07-12 09:01:50 +00:00
qsqlresult	Updated license headers	2016-01-21 18:55:18 +00:00
qsqlthread	Fix invalid placeholder name in tst_qsqlthread.cpp	2017-08-23 12:48:32 +00:00
kernel.pro	SQL: Change in QSqlResultPrivate::positionalToNamedBinding()	2012-12-10 21:23:35 +01:00