QVariant to QJsonValue::Null conversion

Adds a few missing parts of the conversion from QVariant to QJsonValue
after the introduction of the nullptr QVariant. The conversion the other
way is already implemented.

Change-Id: I8b25dec4b476c4761c5098a60944ff11c36f8bec
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 1194260efa..17892b44a2 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -1103,6 +1103,7 @@ void tst_QtJson::fromVariant()
     jsonObject["string"] = stringValue;
     jsonObject["array"] = jsonArray_variant;
 
+    QCOMPARE(QJsonValue::fromVariant(QVariant::fromValue(nullptr)), QJsonValue(QJsonValue::Null));
     QCOMPARE(QJsonValue::fromVariant(QVariant(boolValue)), QJsonValue(boolValue));
     QCOMPARE(QJsonValue::fromVariant(QVariant(intValue)), QJsonValue(intValue));
     QCOMPARE(QJsonValue::fromVariant(QVariant(uintValue)), QJsonValue(static_cast<double>(uintValue)));
@@ -1179,7 +1180,7 @@ void tst_QtJson::toVariantMap()
     array.append(true);
     array.append(999.);
     array.append(QLatin1String("string"));
-    array.append(QJsonValue());
+    array.append(QJsonValue::Null);
     object.insert("Array", array);
 
     map = object.toVariantMap();
@@ -1203,12 +1204,12 @@ void tst_QtJson::toVariantHash()
     QVERIFY(hash.isEmpty());
 
     object.insert("Key", QString("Value"));
-    object.insert("null", QJsonValue());
+    object.insert("null", QJsonValue::Null);
     QJsonArray array;
     array.append(true);
     array.append(999.);
     array.append(QLatin1String("string"));
-    array.append(QJsonValue());
+    array.append(QJsonValue::Null);
     object.insert("Array", array);
 
     hash = object.toVariantHash();