diff options
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); |