qt5base-lts/tests/auto/network
Thiago Macieira 883dfb3d15 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/widgets/kernel/qwidget.cpp

This merge also extends the expected output of the pairdiagnostics
teamcity output (added in dev in commit
c608ffc56a) after the recent addition of
the flowId attribute to the teamcity output (commit
8f03656211 in 5.9).

Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
2017-08-08 11:48:10 +02:00
..
access Merge remote-tracking branch 'origin/5.9' into dev 2017-08-08 11:48:10 +02: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 Re-enable network tests on Mac OS. 2012-04-24 16:06:28 +02:00