Oswald Buddenhagen ee07b912a1 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/widgets/qdockarealayout.cpp src/widgets/widgets/qmainwindow.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmainwindowlayout_p.h tests/auto/corelib/tools/qlocale/tst_qlocale.cpp tests/auto/other/macnativeevents/BLACKLIST tests/auto/widgets/widgets/qmenu/BLACKLIST Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567		2017-08-02 22:52:32 +02:00
..
kernel	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-02 22:52:32 +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