Liang Qi 7f269a5db8 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839		2017-07-06 13:54:25 +02:00
..
access	Fix some qdoc warnings for 5.10	2017-06-20 08:54:52 +00:00
bearer	Typo-fix: s/looses/loses/g	2017-06-08 13:36:18 +00:00
doc	Doc: Remove platform support table for bearer management	2017-05-12 09:44:54 +00:00
kernel	winrt: Enable network proxy support	2017-06-24 17:18:37 +00:00
socket	Make QTcpServerPrivate exportable	2017-07-05 10:13:16 +00:00
ssl	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-06 13:54:25 +02:00
configure.json	QSslSocket: OpenSSL 1.1 backend	2017-07-04 18:03:59 +00:00
configure.pri	configure: make library sources fail more verbosely	2016-12-30 10:25:38 +00:00
network.pro	Android: Bearer jar shouldn't be a dependency if disabled	2017-03-17 19:25:43 +00:00