diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-25 14:14:05 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-04 03:04:15 +0000 |
commit | 6c64a9b2d29d5de054d1d8ccec2050c28767c10c (patch) | |
tree | 097da82dfcf980d19911ba86b56a1b025dfa23d2 /src/corelib/kernel/qmetatype.cpp | |
parent | 71e41d7230650e4b25cfe0f2ac8e3c87e8e4119e (diff) |
Metatype: make the Qt CBOR value-like types built-in meta types
This change only adds them to the registry and reserves the IDs. The
next commit will handle conversions.
Change-Id: I56b444f9d6274221a3b7fffd150d2d49f40940c2
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 13c92d35f4..76e3d0d014 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -65,6 +65,9 @@ # include "qjsonobject.h" # include "qjsonarray.h" # include "qjsondocument.h" +# include "qcborvalue.h" +# include "qcborarray.h" +# include "qcbormap.h" # include "qbytearraylist.h" #endif @@ -1346,6 +1349,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QJsonObject: case QMetaType::QJsonArray: case QMetaType::QJsonDocument: + case QMetaType::QCborValue: + case QMetaType::QCborArray: + case QMetaType::QCborMap: return false; case QMetaType::Nullptr: stream << *static_cast<const std::nullptr_t *>(data); @@ -1484,6 +1490,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QEasingCurve: stream << *static_cast<const NS(QEasingCurve)*>(data); break; + case QMetaType::QCborSimpleType: + stream << *static_cast<const quint8 *>(data); + break; #endif // QT_BOOTSTRAPPED case QMetaType::QFont: case QMetaType::QPixmap: @@ -1572,6 +1581,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QJsonObject: case QMetaType::QJsonArray: case QMetaType::QJsonDocument: + case QMetaType::QCborValue: + case QMetaType::QCborArray: + case QMetaType::QCborMap: return false; case QMetaType::Nullptr: stream >> *static_cast<std::nullptr_t *>(data); @@ -1716,6 +1728,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QEasingCurve: stream >> *static_cast< NS(QEasingCurve)*>(data); break; + case QMetaType::QCborSimpleType: + stream >> *static_cast<quint8 *>(data); + break; #endif // QT_BOOTSTRAPPED case QMetaType::QFont: case QMetaType::QPixmap: |