Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +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
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
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
tst_qtjson.cpp	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00