diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/corelib/serialization/qjsondocument.cpp | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/corelib/serialization/qjsondocument.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index aaa0f6acaa..179a87c699 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -351,22 +351,10 @@ QByteArray QJsonDocument::toJson() const when converting to a QJsonDocument using toJson(). \value Indented Defines human readable output as follows: - \code - { - "Array": [ - true, - 999, - "string" - ], - "Key": "Value", - "null": null - } - \endcode + \snippet code/src_corelib_serialization_qjsondocument.cpp 0 \value Compact Defines a compact output as follows: - \code - {"Array":[true,999,"string"],"Key":"Value","null":null} - \endcode + \snippet code/src_corelib_serialization_qjsondocument.cpp 1 */ /*! |