qt5base-lts/tests/auto/sql/kernel
Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
2016-06-21 08:39:41 +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 dev 2016-06-21 08:39:41 +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