diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-11 13:47:32 -0800 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-08 07:46:41 +0000 |
| commit | c4ed96513e5f9bd231084dfd39113391590d5387 (patch) | |
| tree | 315be87e804fd1999397fa0152ee9c4727182a41 /src/corelib/serialization/qjsonvalue.h | |
| parent | 49c93774212904291bc2df008b265323ec55e62e (diff) | |
QCborValue: add support for QVariant and JSON conversions
Plus QStringList.
Change-Id: I39332e0a867442d58082fffd1508dfb9b540af23
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjsonvalue.h')
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 96538ebbf9..316d3fdf45 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -150,6 +150,7 @@ private: friend class QJsonPrivate::Value; friend class QJsonArray; friend class QJsonObject; + friend class QCborValue; friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); QJsonValue(QJsonPrivate::Data *d, QJsonPrivate::Base *b, const QJsonPrivate::Value& v); |