diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-29 01:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-29 01:00:22 +0200 |
| commit | 4a54e8fd821651079a53f4adc831efd6b1ba9bc7 (patch) | |
| tree | 32dfcf43aa554a9e235a37a831e366b68bcaafa3 /src/corelib/serialization | |
| parent | e092b32922ef650d49167aaf48f9d33190191f9f (diff) | |
| parent | 9f1a1e320c118ec84d389aaf83008bf01521ce6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic712e8a84b01b212bb1121d7a2c9b85e0d2da9da
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborstream.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index 1392b4d8d6..078c14a32d 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -1456,6 +1456,7 @@ bool QCborStreamWriter::endMap() /*! \class QCborStreamReader::StringResult + \inmodule QtCore This class is returned by readString() and readByteArray(), with either the contents of the string that was read or an indication that the parsing is |