Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
bom.json	Correctly parse json documents with a leading BOM	2012-05-10 13:50:35 +02:00
json.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02: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	Merge remote-tracking branch 'origin/stable' into dev	2013-06-12 19:17:07 +02:00