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
..
invalidBinaryData	QJsonDocument: Avoid overflow of string lengths	2018-05-14 10:52:47 +00:00
bom.json	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
CMakeLists.txt	CMake: Regenerate tests projects	2020-03-12 11:41:39 +01:00
json.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
json.qrc	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
test2.json	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
test3.json	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
test.bjson	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
test.json	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
tst_qtjson.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-05-04 17:38:40 +02:00