diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
| commit | 37d3bc9ad7731a131485a9be1ae5b5aac430f82e (patch) | |
| tree | 2456b1d9bb5050bd5c871c62d0a2d362a1a003c7 /src/corelib/serialization/qcborstream.cpp | |
| parent | 1983abddc06350541ac7a4bb4b2da14091e96311 (diff) | |
| parent | 900b57ea90ebe60414a5188337bc85ee4faac220 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ic1dd39044e19f50e1068d4ac70dacaad6440e570
Diffstat (limited to 'src/corelib/serialization/qcborstream.cpp')
| -rw-r--r-- | src/corelib/serialization/qcborstream.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index fc5610e341..d7b81ae324 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -1422,12 +1422,14 @@ bool QCborStreamWriter::endMap() */ /*! - \variable Container QCborStreamReader::StringResult::data + \variable QCborStreamReader::StringResult::data + Contains the actual data from the string if \l status is \c Ok. */ /*! - \variable QCborStreamReader::StringResultCode QCborStreamReader::StringResult::status + \variable QCborStreamReader::StringResult::status + Contains the status of the attempt of reading the string from the stream. */ |