diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-21 23:59:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-22 01:53:29 +0100 |
| commit | bf58c70546c5f9cb66d99b82abfde9ba1a056192 (patch) | |
| tree | df3675d3377ef6576f82fb167ebd67fcc900a91b /src/corelib/serialization/qcborstream.cpp | |
| parent | 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 (diff) | |
| parent | 41cba737a98b16a2767c55cda0532f38b6b6a37d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/io/qdir.cpp
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtimer.h
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
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 39f9e2e70a..546f9ffe57 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -1438,12 +1438,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. */ |