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
..
access	Use QSharedPointer::create() more	2017-07-19 13:40:42 +00:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Deprecate and remove the unused bearer support in QNetworkProxy	2017-07-21 18:25:42 +00:00
socket	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-02 22:52:32 +02:00
ssl	tst_QSslSocket::ephemeralServerKey - fix for OpenSSL 1.1	2017-07-25 13:29:32 +00:00
network.pro