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
..
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
BLACKLIST	Ignore tst_QFocusEvent failures on macOS 10.12	2017-07-29 09:35:03 +00:00
qfocusevent.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_qfocusevent.cpp	Typo-fix: s/looses/loses/g	2017-06-08 13:36:18 +00:00