qt6-bb10/tests/auto/network
Liang Qi 9bfe3ab71e Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/plugins/platforms/android/qandroidplatformopenglcontext.h
	src/plugins/platforms/android/qandroidplatformtheme.h

Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
2016-12-16 09:45:16 +01:00
..
access Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
bearer Updated license headers 2016-01-21 18:55:18 +00:00
kernel QHostAddress: fix assignment operators 2016-12-07 13:21:20 +00:00
socket Fix warnings in tests (MinGW/MSCV) 2016-11-29 17:08:46 +00:00
ssl remove redundant conditionals regarding ssl 2016-10-04 08:25:24 +00:00
network.pro