Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +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-04 19:34:36 +02:00