1 files changed, 15 insertions, 7 deletions
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp
index b943818583..ed454d5442 100644
--- a/src/corelib/json/qjsondocument.cpp
+++ b/src/corelib/json/qjsondocument.cpp
@@ -260,19 +260,28 @@ QJsonDocument QJsonDocument::fromBinaryData(const QByteArray &data, DataValidati
  Creates a QJsonDocument from the QVariant \a variant.
 
  If the \a variant contains any other type than a QVariantMap,
- QVariantList or QStringList, the returned document is invalid.
+ QVariantHash, QVariantList or QStringList, the returned document is invalid.
 
  \sa toVariant()
  */
 QJsonDocument QJsonDocument::fromVariant(const QVariant &variant)
 {
     QJsonDocument doc;
-    if (variant.type() == QVariant::Map) {
+    switch (variant.type()) {
+    case QVariant::Map:
         doc.setObject(QJsonObject::fromVariantMap(variant.toMap()));
-    } else if (variant.type() == QVariant::List) {
+        break;
+    case QVariant::Hash:
+        doc.setObject(QJsonObject::fromVariantHash(variant.toHash()));
+        break;
+    case QVariant::List:
         doc.setArray(QJsonArray::fromVariantList(variant.toList()));
-    } else if (variant.type() == QVariant::StringList) {
+        break;
+    case QVariant::StringList:
         doc.setArray(QJsonArray::fromStringList(variant.toStringList()));
+        break;
+    default:
+        break;
     }
     return doc;
 }
@@ -341,10 +350,9 @@ QByteArray QJsonDocument::toJson() const
 #ifndef QT_JSON_READONLY
 QByteArray QJsonDocument::toJson(JsonFormat format) const
 {
-    if (!d)
-        return QByteArray();
-
     QByteArray json;
+    if (!d)
+        return json;
 
     if (d->header->root()->isArray())
         QJsonPrivate::Writer::arrayToJson(static_cast<QJsonPrivate::Array *>(d->header->root()), json, 0, (format == Compact));