Go to file
Jean-Paul Delimat 4bb5566632 Add toJson() formatting argument to QJsonDocument interface
The writer delegate used by QJsonDocument to produce a Json QByteArray
supports generating a human readable Json (with spaces and carriage
returns that reflect the Json structure) and a less human readable (no
spaces nor carriage returns) but more compact Json.

The method toJson() was extended with a format argument to support
the compact Json generation.

Task-number: QTBUG-28815
Change-Id: I8d13849ab9ab6ed7c645011260251dc14a8629d2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Debao Zhang <hello@debao.me>
2013-01-26 03:09:27 +01:00
bin fixqt4headers: Fix typo in QtMultimedia headers module name 2013-01-18 17:58:48 +01:00
config.tests Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
dist Merge remote-tracking branch 'origin/stable' into dev 2013-01-24 16:02:55 +01:00
doc Merge remote-tracking branch 'origin/release' into stable 2013-01-22 18:32:47 +01:00
examples Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
qmake Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
src Add toJson() formatting argument to QJsonDocument interface 2013-01-26 03:09:27 +01:00
tests Add toJson() formatting argument to QJsonDocument interface 2013-01-26 03:09:27 +01:00
tools Disable only accessibility bridge without dbus on linux 2013-01-23 10:56:34 +01:00
util Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Add qmake generated files to .gitignore. 2012-12-19 21:31:58 +01:00
.qmake.conf don't auto-install example sources by default for all modules 2012-12-03 15:56:28 +01:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Merge remote-tracking branch 'origin/stable' into dev 2013-01-24 16:02:55 +01:00
configure.bat Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL fix links in INSTALL 2012-10-10 08:45:22 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qtbase.pro rewrite default spec handling 2012-11-01 20:17:57 +01:00
sync.profile Remove compat, obsolete headers 2012-12-19 23:43:25 +01:00