diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-28 01:00:26 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-28 01:00:26 +0200 |
| commit | 9f1a1e320c118ec84d389aaf83008bf01521ce6f (patch) | |
| tree | f46cc4c08e8bb3a7ae9125d8bfe0ae7d6cc2e312 /src/corelib/serialization/qcborstream.cpp | |
| parent | d6e65ecac5852ed09fbf580b3fab5b21125dfd69 (diff) | |
| parent | c9002ab7eec1649d700865eac418f1f5d3b0d1a2 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibce9bfef928ce39070183c488ce86ae32e5ea705
Diffstat (limited to 'src/corelib/serialization/qcborstream.cpp')
| -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 |