Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01: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
test2.json
test3.json
test.bjson
test.json
tst_qtjson.cpp	Add conversion between QVariantHash and QJsonObject	2014-10-30 12:14:42 +01:00