diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:34:23 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-31 11:34:23 +0000 |
| commit | cf2d59bfe8720627e016195903e16cd0c97fa612 (patch) | |
| tree | 5cc0755d649d606867bf6168a091a91c9d3e6f3d /src/corelib/serialization | |
| parent | 7621bb0f3bba69e0b2849974a335dff4742c8e95 (diff) | |
| parent | 23c9d4c98f3c6729b56700edc1d7144b444b16db (diff) | |
Merge "Merge branch '5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 54d1ae816b..60467b4824 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -1082,7 +1082,7 @@ QDataStream &QDataStream::readBytes(char *&s, uint &l) Reads at most \a len bytes from the stream into \a s and returns the number of bytes read. If an error occurs, this function returns -1. - The buffer \a s must be preallocated. The data is \e not encoded. + The buffer \a s must be preallocated. The data is \e not decoded. \sa readBytes(), QIODevice::read(), writeRawData() */ diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index ab27b45fda..5018f7c267 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -344,6 +344,7 @@ QByteArray QJsonDocument::toJson() const /*! \enum QJsonDocument::JsonFormat + \since 5.1 This value defines the format of the JSON byte array produced when converting to a QJsonDocument using toJson(). @@ -368,6 +369,7 @@ QByteArray QJsonDocument::toJson() const */ /*! + \since 5.1 Converts the QJsonDocument to a UTF-8 encoded JSON document in the provided \a format. \sa fromJson(), JsonFormat diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 3c5b0a0e02..4469302e31 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -588,6 +588,7 @@ bool QJsonValue::toBool(bool defaultValue) const } /*! + \since 5.2 Converts the value to an int and returns it. If type() is not Double or the value is not a whole number, |