Liang Qi 7c4b0aa970 Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/corelib/io/qstandardpaths_win.cpp src/plugins/platforms/ios/qioswindow.mm src/plugins/platforms/ios/quiview.mm tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I5deb0a0176a454a9c566e924d074ba60ce04f0bc		2017-11-23 12:52:18 +01:00
..
access	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-23 12:52:18 +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-11-23 12:52:18 +01:00
network.pro