diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-09-21 16:24:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-05 14:53:33 +0000 |
| commit | 4b63ab9a93dfcdad5bdcce3aa437e16598233ca1 (patch) | |
| tree | 6f815086da1f88c82374f766fa5c67fe0562b82a /src/corelib/json | |
| parent | 2cd2cba0868efb7e8dd2d00805f1a5ceed0a1349 (diff) | |
QJsonValue::toVariant(): Differentiate between null and invalid
Both were mapped to QVariant() before. Instead, use a null pointer
QVariant for a null JSON value.
[ChangeLog][QtCore][QJsonValue] QJsonValue(Null).toVariant() now returns
a QVariant of type QMetaType::Nullptr instead of an invalid QVariant.
Task-number: QTBUG-43077
Change-Id: Ife611f418583dbff542210bc8c5cd65201212a6e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/json')
| -rw-r--r-- | src/corelib/json/qjsonvalue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 718dfa43b3..5a906dda7b 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -438,7 +438,7 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant) The QJsonValue types will be converted as follows: - \value Null \l {QVariant::}{QVariant()} + \value Null QMetaType::Nullptr \value Bool QMetaType::Bool \value Double QMetaType::Double \value String QString @@ -466,6 +466,7 @@ QVariant QJsonValue::toVariant() const QJsonObject(d, static_cast<QJsonPrivate::Object *>(base)).toVariantMap() : QVariantMap(); case Null: + return QVariant::fromValue(nullptr); case Undefined: break; } |