qt6-bb10/src/network
Qt Forward Merge Bot 0f7987f0c9 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	src/corelib/text/qlocale.cpp
	src/network/access/qnetworkaccessmanager.cpp

Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt

Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01
2020-05-04 17:38:40 +02:00
..
access Merge remote-tracking branch 'origin/5.15' into dev 2020-05-04 17:38:40 +02:00
doc Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
kernel Merge remote-tracking branch 'origin/5.15' into dev 2020-05-04 17:38:40 +02:00
socket Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
ssl Merge remote-tracking branch 'origin/5.15' into dev 2020-05-04 17:38:40 +02:00
.prev_CMakeLists.txt CMake: Handle finding of OpenSSL headers correctly 2020-04-08 22:03:24 +02:00
CMakeLists.txt CMake: Handle finding of OpenSSL headers correctly 2020-04-08 22:03:24 +02:00
configure.cmake CMake: Handle finding of OpenSSL headers correctly 2020-04-08 22:03:24 +02:00
configure.json Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
configure.pri configure: actually resolve libraries into full filepaths 2018-12-03 11:25:56 +00:00
network.pro QtNetwork: Delete bearer management 2020-04-05 16:41:08 +02:00