From 029bb47e12d63e186663714c3776d3654285496b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 29 Dec 2024 21:34:30 -0300 Subject: QJson: Remove QT_JSON_READONLY moc (and thus the bootstrap library) has needed JSON output since Qt 5.15 (commit da284ef10e0ef80776b9fc9b7bb0e6dc8d71ba63 "Add support for machine-readable JSON output to the MOC"). Pick-to: 6.9 Change-Id: I4b8cf51c092eb35cc383fffd48d120f0cb2c56b0 Reviewed-by: Ahmad Samir Reviewed-by: Johannes Grunenberg --- src/corelib/serialization/qjsonarray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/serialization/qjsonarray.cpp') diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index d839c5cd950..402076eb814 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -1073,7 +1073,7 @@ size_t qHash(const QJsonArray &array, size_t seed) return qHashRange(array.begin(), array.end(), seed); } -#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) +#if !defined(QT_NO_DEBUG_STREAM) QDebug operator<<(QDebug dbg, const QJsonArray &a) { QDebugStateSaver saver(dbg); -- cgit v1.2.3