Qt Forward Merge Bot 58a4289800 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404		2020-04-11 14:59:13 +02:00
..
invalidBinaryData	QJsonDocument: Avoid overflow of string lengths	2018-05-14 10:52:47 +00:00
CMakeLists.txt	CMake: Regenerate tests projects	2020-03-12 11:41:39 +01:00
bom.json	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00: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
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
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
tst_qtjson.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-04-11 14:59:13 +02:00