1 files changed, 46 insertions, 6 deletions
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 5878d56a47..015228d7b9 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -137,6 +137,8 @@ private Q_SLOTS:
     void garbageAtEnd();
 
     void removeNonLatinKey();
+    void documentFromVariant();
+
 private:
     QString testDataDir;
 };
@@ -1184,14 +1186,14 @@ void tst_QtJson::toVariantMap()
 
     QCOMPARE(map.size(), 3);
     QCOMPARE(map.value("Key"), QVariant(QString("Value")));
-    QCOMPARE(map.value("null"), QVariant());
+    QCOMPARE(map.value("null"), QVariant::fromValue(nullptr));
     QCOMPARE(map.value("Array").type(), QVariant::List);
     QVariantList list = map.value("Array").toList();
     QCOMPARE(list.size(), 4);
     QCOMPARE(list.at(0), QVariant(true));
     QCOMPARE(list.at(1), QVariant(999.));
     QCOMPARE(list.at(2), QVariant(QLatin1String("string")));
-    QCOMPARE(list.at(3), QVariant());
+    QCOMPARE(list.at(3), QVariant::fromValue(nullptr));
 }
 
 void tst_QtJson::toVariantHash()
@@ -1213,14 +1215,14 @@ void tst_QtJson::toVariantHash()
 
     QCOMPARE(hash.size(), 3);
     QCOMPARE(hash.value("Key"), QVariant(QString("Value")));
-    QCOMPARE(hash.value("null"), QVariant());
+    QCOMPARE(hash.value("null"), QVariant::fromValue(nullptr));
     QCOMPARE(hash.value("Array").type(), QVariant::List);
     QVariantList list = hash.value("Array").toList();
     QCOMPARE(list.size(), 4);
     QCOMPARE(list.at(0), QVariant(true));
     QCOMPARE(list.at(1), QVariant(999.));
     QCOMPARE(list.at(2), QVariant(QLatin1String("string")));
-    QCOMPARE(list.at(3), QVariant());
+    QCOMPARE(list.at(3), QVariant::fromValue(nullptr));
 }
 
 void tst_QtJson::toVariantList()
@@ -1244,14 +1246,14 @@ void tst_QtJson::toVariantList()
 
     QCOMPARE(list.size(), 3);
     QCOMPARE(list[0], QVariant(QString("Value")));
-    QCOMPARE(list[1], QVariant());
+    QCOMPARE(list[1], QVariant::fromValue(nullptr));
     QCOMPARE(list[2].type(), QVariant::List);
     QVariantList vlist = list[2].toList();
     QCOMPARE(vlist.size(), 4);
     QCOMPARE(vlist.at(0), QVariant(true));
     QCOMPARE(vlist.at(1), QVariant(999.));
     QCOMPARE(vlist.at(2), QVariant(QLatin1String("string")));
-    QCOMPARE(vlist.at(3), QVariant());
+    QCOMPARE(vlist.at(3), QVariant::fromValue(nullptr));
 }
 
 void tst_QtJson::toJson()
@@ -2788,5 +2790,43 @@ void tst_QtJson::removeNonLatinKey()
     QVERIFY(restoredObject.contains(nonLatinKeyName));
 }
 
+void tst_QtJson::documentFromVariant()
+{
+    // Test the valid forms of QJsonDocument::fromVariant.
+
+    QString string = QStringLiteral("value");
+
+    QStringList strList;
+    strList.append(string);
+
+    QJsonDocument da1 = QJsonDocument::fromVariant(QVariant(strList));
+    QVERIFY(da1.isArray());
+
+    QVariantList list;
+    list.append(string);
+
+    QJsonDocument da2 = QJsonDocument::fromVariant(list);
+    QVERIFY(da2.isArray());
+
+    // As JSON arrays they should be equal.
+    QCOMPARE(da1.array(), da2.array());
+
+
+    QMap <QString, QVariant> map;
+    map["key"] = string;
+
+    QJsonDocument do1 = QJsonDocument::fromVariant(QVariant(map));
+    QVERIFY(do1.isObject());
+
+    QHash <QString, QVariant> hash;
+    hash["key"] = string;
+
+    QJsonDocument do2 = QJsonDocument::fromVariant(QVariant(hash));
+    QVERIFY(do2.isObject());
+
+    // As JSON objects they should be equal.
+    QCOMPARE(do1.object(), do2.object());
+}
+
 QTEST_MAIN(tst_QtJson)
 #include "tst_qtjson.moc"