diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-15 19:04:30 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-03-15 19:04:30 +0000 |
| commit | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (patch) | |
| tree | 9f9d05bb098dc65b8a36c5db59b451573e507cb9 /src/corelib/serialization/qcborstream.cpp | |
| parent | 73a2e9c4098037aaa540b97ff097c660290622da (diff) | |
| parent | 32084b073362e52df597cc388cf54f5173e20b0d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
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! |