summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qmetatype.cpp
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@qt.io>2018-08-21 10:35:30 +0200
committerJędrzej Nowacki <jedrzej.nowacki@qt.io>2018-10-03 14:48:47 +0000
commitcc24fc04067f23c445c7ca54733b0870e39b7d7d (patch)
treea894013d6249d83ed5114b32da97e881409429f9 /src/corelib/kernel/qmetatype.cpp
parent98ec8bed198d3428a9642c542518f7cca07acfb3 (diff)
Implement QJsonDocument data stream operators
Task-number: QTBUG-48313 Change-Id: I25ebeed94c9340819e925a7740bbee21de73a0ca Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r--src/corelib/kernel/qmetatype.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index dbc11c57ec..29e57c659d 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1416,7 +1416,6 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
case QMetaType::QJsonValue:
case QMetaType::QJsonObject:
case QMetaType::QJsonArray:
- case QMetaType::QJsonDocument:
case QMetaType::QCborValue:
case QMetaType::QCborArray:
case QMetaType::QCborMap:
@@ -1561,6 +1560,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
case QMetaType::QCborSimpleType:
stream << *static_cast<const quint8 *>(data);
break;
+ case QMetaType::QJsonDocument:
+ stream << *static_cast<const NS(QJsonDocument)*>(data);
+ break;
#endif // QT_BOOTSTRAPPED
case QMetaType::QFont:
case QMetaType::QPixmap:
@@ -1648,7 +1650,6 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
case QMetaType::QJsonValue:
case QMetaType::QJsonObject:
case QMetaType::QJsonArray:
- case QMetaType::QJsonDocument:
case QMetaType::QCborValue:
case QMetaType::QCborArray:
case QMetaType::QCborMap:
@@ -1799,6 +1800,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
case QMetaType::QCborSimpleType:
stream >> *static_cast<quint8 *>(data);
break;
+ case QMetaType::QJsonDocument:
+ stream >> *static_cast<NS(QJsonDocument)*>(data);
+ break;
#endif // QT_BOOTSTRAPPED
case QMetaType::QFont:
case QMetaType::QPixmap: