diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /src/corelib/serialization | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
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, |