diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 01:00:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 01:00:48 +0200 |
| commit | 3176c821bf5b0a4c1fa0e6c30a706a9f256baa8e (patch) | |
| tree | 92af1a9fcacb72f781b2eb4ff4bc55a96b7a604a /src/corelib/serialization | |
| parent | 375f56506089f98118aa1848ed9f05a35e212c90 (diff) | |
| parent | c53f84300111c90b8a63e117fe834a3d52df54c3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9823da32168e99bbece2f8337d0bd4d33e6d634c
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 179a87c699..ed7c3f21f1 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -332,7 +332,7 @@ QVariant QJsonDocument::toVariant() const } /*! - Converts the QJsonDocument to a UTF-8 encoded JSON document. + Converts the QJsonDocument to an indented, UTF-8 encoded JSON document. \sa fromJson() */ |