Liang Qi 88cf044580 Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/gui/kernel/qwindow.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowssystemtrayicon.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233		2017-11-09 11:47:57 +01:00
..
kernel	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
models	QSql tests: Remove Windows CE and clean up code.	2016-03-10 15:07:02 +00:00
sql.pro