diff options
Diffstat (limited to 'src/corelib/json/qjsondocument.h')
| -rw-r--r-- | src/corelib/json/qjsondocument.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/json/qjsondocument.h index 4e76af21e2..b784890c54 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/json/qjsondocument.h @@ -129,11 +129,9 @@ public: Compact }; - static QJsonDocument fromJson(const QByteArray &json, QJsonParseError *error = Q_NULLPTR); + static QJsonDocument fromJson(const QByteArray &json, QJsonParseError *error = nullptr); -#ifdef Q_QDOC - QByteArray toJson(JsonFormat format = Indented) const; -#elif !defined(QT_JSON_READONLY) +#if !defined(QT_JSON_READONLY) || defined(Q_CLANG_QDOC) QByteArray toJson() const; //### Merge in Qt6 QByteArray toJson(JsonFormat format) const; #endif |