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
..
qmacstyle	QMacStyle: Replace QAquaWidgetSize with WidgetSizePolicy	2017-05-15 22:39:28 +00:00
qstyle	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-02 22:52:32 +02:00
qstyleoption	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qstylesheetstyle	Refactor tst_QStyleSheetStyle::focus/hoverColors()	2017-06-12 14:27:04 +00:00
styles.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00