diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2024-12-29 21:34:30 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2025-01-17 16:45:58 -0800 |
| commit | 029bb47e12d63e186663714c3776d3654285496b (patch) | |
| tree | b9d48c3563d690b91cd7f723bee0633a617c9bc7 /src/corelib/serialization/qjsondocument.cpp | |
| parent | 9d35561f6f6be125369e6020ce95a73b4aa6b51f (diff) | |
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 <a.samirh78@gmail.com>
Reviewed-by: Johannes Grunenberg <nerixdev@outlook.de>
Diffstat (limited to 'src/corelib/serialization/qjsondocument.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 9b1439c66a6..ef012b7154a 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -242,7 +242,6 @@ QVariant QJsonDocument::toVariant() const \sa fromJson(), JsonFormat */ -#if !defined(QT_JSON_READONLY) || defined(Q_QDOC) QByteArray QJsonDocument::toJson(JsonFormat format) const { QByteArray json; @@ -253,7 +252,6 @@ QByteArray QJsonDocument::toJson(JsonFormat format) const format == JsonFormat::Compact ? QJsonValue::JsonFormat::Compact : QJsonValue::JsonFormat::Indented); } -#endif /*! Parses \a json as a UTF-8 encoded JSON document, and creates a QJsonDocument @@ -472,7 +470,7 @@ bool QJsonDocument::isNull() const return (d == nullptr); } -#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) +#if !defined(QT_NO_DEBUG_STREAM) QDebug operator<<(QDebug dbg, const QJsonDocument &o) { QDebugStateSaver saver(dbg); |