Lars Knoll 26237f0a2d Fix QJsonValue::fromVariant() if the variant contains a json object ... If the variant contains a known json type (value, array, object or document), simply unwrap those. In the case of the json document wrap the contained object/array into a QJsonValue. This should be the expected behavior, and makes more sense than returning a null QJsonValue. Task-number: QTBUG-41234 Change-Id: Id084fc11220d51aaf78b7694fd0ebef1411f5c51 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>		2015-12-22 10:00:46 +00:00
..
bom.json	Correctly parse json documents with a leading BOM	2012-05-10 13:50:35 +02:00
json.pro	Android: Fix json test.	2014-12-22 08:32:39 +01:00
json.qrc	Android: Fix json test.	2014-12-22 08:32:39 +01:00
test.bjson	Fix parsing of unicode escape sequences	2012-03-07 00:03:07 +01:00
test.json	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00
test2.json	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00
test3.json	Add the missing test file and give it a proper name.	2012-01-30 18:48:28 +01:00
tst_qtjson.cpp	Fix QJsonValue::fromVariant() if the variant contains a json object	2015-12-22 10:00:46 +00:00