diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-18 16:34:55 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-20 17:25:09 +0200 |
| commit | 35d90cb89809b540fec49e974e1a9f802f819eb6 (patch) | |
| tree | dd0d8affdc3cc4419f69699e51f3e46a86685d65 /src/corelib/serialization/qjsoncbor.cpp | |
| parent | a41c61fb2d2f973fd1cd5e95ee5be1ac1a4f8433 (diff) | |
Resolve the remaining open ### Qt6 comments of QJsonValue
Changed QJsonValue to use QCborValue for data storage. Removed unused
internal methods.
Task-number: QTBUG-85700
Change-Id: I784fc7c0c4407f79eb7ca87a1f5116f00c26155d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qjsoncbor.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsoncbor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index e836935f6f..5d6f521d1b 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -640,7 +640,7 @@ QCborValue QCborValue::fromJsonValue(const QJsonValue &v) case QJsonValue::Bool: return v.toBool(); case QJsonValue::Double: { - if (v.t == Integer) + if (v.value.t == Integer) return v.toInteger(); return v.toDouble(); } |