From fcb0f68e77bb69544f0ae310baffd3ceff8a9e5d Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 25 Jan 2018 15:25:35 -0800 Subject: CBOR: Complete the conversions between CBOR, JSON and Qt meta types Change-Id: I56b444f9d6274221a3b7fffd150d3130db6ef1a0 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/serialization/qjsoncbor.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/corelib/serialization/qjsoncbor.cpp') diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index ef6acbcbf0..46d2555554 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -728,14 +728,19 @@ QCborValue QCborValue::fromVariant(const QVariant &variant) return QCborArray::fromJsonArray(doc.array()); return QCborMap::fromJsonObject(doc.object()); } + case QMetaType::QCborValue: + return variant.value(); + case QMetaType::QCborArray: + return variant.value(); + case QMetaType::QCborMap: + return variant.value(); + case QMetaType::QCborSimpleType: + return variant.value(); #endif default: break; } - if (variant.userType() == qMetaTypeId()) - return variant.value(); - if (variant.isNull()) return QCborValue(nullptr); -- cgit v1.2.3