Liang Qi c0359bd3c3 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/corelib/global/qfloat16.cpp src/corelib/global/qfloat16.h src/plugins/platforms/windows/qwindowswindow.cpp Change-Id: I0938aaa6a9771f55e48c95ed29f6f5291431b947		2019-05-15 07:11:41 +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
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.13' into dev	2019-05-15 07:11:41 +02:00