diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-27 11:13:49 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-08 09:50:32 +0000 |
| commit | baebb6aa26799e627bc3be6bf41589cef422bed2 (patch) | |
| tree | dfa33faec314b1988b415a110e77c66d36b09d2b /src | |
| parent | c6477286525682773ae3739fee53689e225d1b0a (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/json/qjsonvalue.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 5a906dda7b..4b52014db1 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -349,6 +349,12 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other) \row \li \list + \li QMetaType::Nullptr + \endlist + \li QJsonValue::Null + \row + \li + \list \li QMetaType::Bool \endlist \li QJsonValue::Bool @@ -393,6 +399,8 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other) QJsonValue QJsonValue::fromVariant(const QVariant &variant) { switch (variant.userType()) { + case QMetaType::Nullptr: + return QJsonValue(Null); case QVariant::Bool: return QJsonValue(variant.toBool()); case QVariant::Int: diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 72ae3b063f..ccfa7d0d38 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3085,6 +3085,7 @@ bool QVariant::canConvert(int targetTypeId) const if (currentType == QMetaType::QJsonValue) { switch (targetTypeId) { + case QMetaType::Nullptr: case QMetaType::QString: case QMetaType::Bool: case QMetaType::Int: |