1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QJsonArray: symmetrize QDataStream op>>/<<

Browse Source 
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.5
Change-Id: Ia378bf0fb04ce33e3af24a2ce67778e89c41e31a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 264d54953e8b53f2454fbf8361b851923b8115a5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3b8de80dfe01ed185d9a40cc9c3ca79ad748c1ea)
This commit is contained in:
Marc Mutz 2024-01-27 10:00:25 +01:00 committed by Qt Cherry-pick Bot
parent 98d1b439e8
commit 60f3c19167
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/serialization/qjsonarray.cpp
View File

@ -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)