From c4ed96513e5f9bd231084dfd39113391590d5387 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 11 Jan 2018 13:47:32 -0800 Subject: QCborValue: add support for QVariant and JSON conversions Plus QStringList. Change-Id: I39332e0a867442d58082fffd1508dfb9b540af23 Reviewed-by: Edward Welbourne --- src/corelib/serialization/qcborvalue_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/corelib/serialization/qcborvalue_p.h') diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 621fda7158..861b91eec0 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -93,6 +93,7 @@ struct Element } }; Q_DECLARE_OPERATORS_FOR_FLAGS(Element::ValueFlags) +Q_STATIC_ASSERT(sizeof(Element) == 16); struct ByteData { @@ -112,8 +113,6 @@ struct ByteData QStringView asStringView() const{ return QStringView(utf16(), len / 2); } QString asQStringRaw() const { return QString::fromRawData(utf16(), len / 2); } }; - -Q_STATIC_ASSERT(sizeof(Element) == 16); Q_STATIC_ASSERT(std::is_pod::value); } // namespace QtCbor -- cgit v1.2.3