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
..
access	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Remove failing QVERIFY on bearer management	2017-10-28 06:08:46 +00:00
socket	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
ssl	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-04 13:41:04 +02:00
network.pro