summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <[email protected]>2024-01-27 10:00:25 +0100
committerQt Cherry-pick Bot <[email protected]>2024-01-31 21:23:46 +0000
commita5cb5f8f2a1959a67a5d5ba4037f52918b95edfb (patch)
tree12e979ceedc62790c578f87f67bc42223388e12b
parent40777d285621feab0637686c3d117bdfb370c90f (diff)
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(). Change-Id: Ia378bf0fb04ce33e3af24a2ce67778e89c41e31a Reviewed-by: Ivan Solovev <[email protected]> (cherry picked from commit 264d54953e8b53f2454fbf8361b851923b8115a5) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 3b8de80dfe01ed185d9a40cc9c3ca79ad748c1ea) (cherry picked from commit 60f3c191673949add5373aaaa2ea8b74bc0f512a)
-rw-r--r--src/corelib/serialization/qjsonarray.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp
index 8c3b95e587d..58f13ea24d8 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)