AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QVariant to QJsonValue::Null conversion

Browse Source 
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>
This commit is contained in:
Allan Sandfeld Jensen 2016-09-27 11:13:49 +02:00 committed by Allan Sandfeld Jensen
parent c647728652
commit baebb6aa26
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/json/qjsonvalue.cpp
View File

@ -346,6 +346,12 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
\header \header
\li Source type \li Source type
\li Destination type \li Destination type
\row
\li
\list
\li QMetaType::Nullptr
\endlist
\li QJsonValue::Null
\row \row
\li \li
\list \list
@ -393,6 +399,8 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
QJsonValue QJsonValue::fromVariant(const QVariant &variant) QJsonValue QJsonValue::fromVariant(const QVariant &variant)
{ {
switch (variant.userType()) { switch (variant.userType()) {
case QMetaType::Nullptr:
return QJsonValue(Null);
case QVariant::Bool: case QVariant::Bool:
return QJsonValue(variant.toBool()); return QJsonValue(variant.toBool());
case QVariant::Int: case QVariant::Int:

1
src/corelib/kernel/qvariant.cpp
View File

@ -3085,6 +3085,7 @@ bool QVariant::canConvert(int targetTypeId) const
if (currentType == QMetaType::QJsonValue) { if (currentType == QMetaType::QJsonValue) {
switch (targetTypeId) { switch (targetTypeId) {
case QMetaType::Nullptr:
case QMetaType::QString: case QMetaType::QString:
case QMetaType::Bool: case QMetaType::Bool:
case QMetaType::Int: case QMetaType::Int:

7
tests/auto/corelib/json/tst_qtjson.cpp
View File

@ -1103,6 +1103,7 @@ void tst_QtJson::fromVariant()
jsonObject["string"] = stringValue; jsonObject["string"] = stringValue;
jsonObject["array"] = jsonArray_variant; jsonObject["array"] = jsonArray_variant;
QCOMPARE(QJsonValue::fromVariant(QVariant::fromValue(nullptr)), QJsonValue(QJsonValue::Null));
QCOMPARE(QJsonValue::fromVariant(QVariant(boolValue)), QJsonValue(boolValue)); QCOMPARE(QJsonValue::fromVariant(QVariant(boolValue)), QJsonValue(boolValue));
QCOMPARE(QJsonValue::fromVariant(QVariant(intValue)), QJsonValue(intValue)); QCOMPARE(QJsonValue::fromVariant(QVariant(intValue)), QJsonValue(intValue));
QCOMPARE(QJsonValue::fromVariant(QVariant(uintValue)), QJsonValue(static_cast<double>(uintValue))); QCOMPARE(QJsonValue::fromVariant(QVariant(uintValue)), QJsonValue(static_cast<double>(uintValue)));
@ -1179,7 +1180,7 @@ void tst_QtJson::toVariantMap()
array.append(true); array.append(true);
array.append(999.); array.append(999.);
array.append(QLatin1String("string")); array.append(QLatin1String("string"));
array.append(QJsonValue()); array.append(QJsonValue::Null);
object.insert("Array", array); object.insert("Array", array);
map = object.toVariantMap(); map = object.toVariantMap();
@ -1203,12 +1204,12 @@ void tst_QtJson::toVariantHash()
QVERIFY(hash.isEmpty()); QVERIFY(hash.isEmpty());
object.insert("Key", QString("Value")); object.insert("Key", QString("Value"));
object.insert("null", QJsonValue()); object.insert("null", QJsonValue::Null);
QJsonArray array; QJsonArray array;
array.append(true); array.append(true);
array.append(999.); array.append(999.);
array.append(QLatin1String("string")); array.append(QLatin1String("string"));
array.append(QJsonValue()); array.append(QJsonValue::Null);
object.insert("Array", array); object.insert("Array", array);
hash = object.toVariantHash(); hash = object.toVariantHash();