diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-14 01:00:21 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-03-14 10:49:29 +0100 |
| commit | 32084b073362e52df597cc388cf54f5173e20b0d (patch) | |
| tree | 9a6f881f0ab0bc22e3a491fae81d494815cc514f /src/corelib/serialization/qcborstream.cpp | |
| parent | 8d4e8217fdc01417ab8ea33303dd0ce7f769d10e (diff) | |
| parent | eb25acc05b177c49eb81b190a476854fbf3c6fb1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qcollator_win.cpp
Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5
Diffstat (limited to 'src/corelib/serialization/qcborstream.cpp')
| -rw-r--r-- | src/corelib/serialization/qcborstream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index 546f9ffe57..e222bf5514 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -1950,7 +1950,7 @@ inline void QCborStreamReader::preparse() // for negative integer and we don't have separate types for Boolean, // Null and Undefined). if (type_ == CborBooleanType || type_ == CborNullType || type_ == CborUndefinedType) { - type_ = SimpleType; + type_ = CborSimpleType; value64 = quint8(d->buffer.at(d->bufferStart)) - CborSimpleType; } else { // Using internal TinyCBOR API! |