From ae981f224de9d2a24bfb1547e2049b6ccd9fc4ac Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 30 Oct 2014 10:59:11 +0100 Subject: Add conversion between QVariantHash and QJsonObject Adds automatic conversion from QVariants with a QVariantHash to QJsonValue and explicit methods for conversion between QVariantHash and QJsonObject. [ChangeLog][QtCore][QJsonObject] Added conversion to and from QVariantHash Change-Id: I140ef881463acabaab2648e28209487d8ad18e0d Reviewed-by: Lars Knoll --- src/corelib/json/qjsonvalue.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/corelib/json/qjsonvalue.cpp') diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index ac4fcb89c1..4c5d9e3308 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -373,6 +373,7 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other) \li \list \li QMetaType::QVariantMap + \li QMetaType::QVariantHash \endlist \li QJsonValue::Object \endtable @@ -402,6 +403,8 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant) return QJsonValue(QJsonArray::fromVariantList(variant.toList())); case QVariant::Map: return QJsonValue(QJsonObject::fromVariantMap(variant.toMap())); + case QVariant::Hash: + return QJsonValue(QJsonObject::fromVariantHash(variant.toHash())); default: break; } -- cgit v1.2.3