From 3b8de80dfe01ed185d9a40cc9c3ca79ad748c1ea Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 27 Jan 2024 10:00:25 +0100 Subject: [PATCH] QJsonArray: symmetrize QDataStream op>>/<< In operator<<(), stream the QJsonDocument directly, instead of toJson(Compact). This is how QJsonDocument operator<<() also does things, but that knowledge should be need-to-know, and QJsonArray doesn't, seeing as operator>>() just streams a QJsonDocument, and then calls toArray(). Pick-to: 6.6 6.5 Change-Id: Ia378bf0fb04ce33e3af24a2ce67778e89c41e31a Reviewed-by: Ivan Solovev (cherry picked from commit 264d54953e8b53f2454fbf8361b851923b8115a5) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/serialization/qjsonarray.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index b4e6631e36f..517ac116a6d 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -1076,9 +1076,7 @@ QDebug operator<<(QDebug dbg, const QJsonArray &a) #ifndef QT_NO_DATASTREAM QDataStream &operator<<(QDataStream &stream, const QJsonArray &array) { - QJsonDocument doc{array}; - stream << doc.toJson(QJsonDocument::Compact); - return stream; + return stream << QJsonDocument{array}; } QDataStream &operator>>(QDataStream &stream, QJsonArray &array)