summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization/qcbormap.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-01-11 13:47:32 -0800
committerLiang Qi <liang.qi@qt.io>2018-06-08 07:46:41 +0000
commitc4ed96513e5f9bd231084dfd39113391590d5387 (patch)
tree315be87e804fd1999397fa0152ee9c4727182a41 /src/corelib/serialization/qcbormap.h
parent49c93774212904291bc2df008b265323ec55e62e (diff)
QCborValue: add support for QVariant and JSON conversions
Plus QStringList. Change-Id: I39332e0a867442d58082fffd1508dfb9b540af23 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization/qcbormap.h')
-rw-r--r--src/corelib/serialization/qcbormap.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h
index f8adba4c56..a3eddfea20 100644
--- a/src/corelib/serialization/qcbormap.h
+++ b/src/corelib/serialization/qcbormap.h
@@ -295,6 +295,13 @@ public:
}
iterator insert(value_type v) { return insert(v.first, v.second); }
+ static QCborMap fromVariantMap(const QVariantMap &map);
+ static QCborMap fromVariantHash(const QVariantHash &hash);
+ static QCborMap fromJsonObject(const QJsonObject &o);
+ QVariantMap toVariantMap() const;
+ QVariantHash toVariantHash() const;
+ QJsonObject toJsonObject() const;
+
private:
void detach(qsizetype reserve = 0);