Liang Qi a503bf5470 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/tools/qvector.h Make QVector(DataPointer dd) public to be able to properly merge 5b4b437b30 from 5.15 into dev. src/widgets/kernel/qapplication.cpp tests/auto/tools/moc/allmocs_baseline_in.json Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01		2020-01-04 15:32:34 +01: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
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-01-04 15:32:34 +01:00