qt5base-lts/tests/auto/network
Liang Qi b9585277e7 Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	src/corelib/tools/qlinkedlist.h
	src/plugins/platforms/wasm/qwasmintegration.cpp
	src/plugins/platforms/wasm/qwasmscreen.cpp

Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
2020-02-18 09:26:53 +01:00
..
access Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-06 11:10:34 +01:00
bearer Deprecate constructing QFlags from a pointer 2019-11-20 19:43:38 +01:00
kernel tst_QNetworkInterface: don't force an IPv4 link-local address 2019-12-07 10:20:27 -08:00
selftest Skip instead of fail tests when test server is not available 2020-01-14 00:15:16 +01:00
socket Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-18 09:26:53 +01:00
ssl Merge remote-tracking branch 'origin/5.14' into 5.15 2020-01-28 08:09:51 +01:00
network.pro Skip instead of fail tests when test server is not available 2020-01-14 00:15:16 +01:00