qt5base-lts/tests/auto/sql
Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/win32-g++/qmake.conf
	mkspecs/win32-icc/qmake.conf
	src/platformsupport/fontdatabases/mac/coretext.pri
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
2017-05-29 10:54:41 +02:00
..
kernel Merge remote-tracking branch 'origin/5.9' into dev 2017-05-29 10:54:41 +02:00
models QSql tests: Remove Windows CE and clean up code. 2016-03-10 15:07:02 +00:00
sql.pro Moved sql autotests into new directory structure 2011-09-06 09:32:15 +02:00