diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/json/qjsondocument.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/json/qjsondocument.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 6d144cb65d..520f98b18f 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2087,6 +2087,7 @@ bool QDir::match(const QString &filter, const QString &fileName) #endif // QT_NO_REGEXP /*! + \internal Returns \a path with redundant directory separators removed, and "."s and ".."s resolved (as far as possible). diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp index 6469412054..9794bca60d 100644 --- a/src/corelib/json/qjsondocument.cpp +++ b/src/corelib/json/qjsondocument.cpp @@ -332,7 +332,7 @@ QVariant QJsonDocument::toVariant() const \sa fromJson() */ -#ifndef QT_JSON_READONLY +#if !defined(QT_JSON_READONLY) || defined(Q_CLANG_QDOC) QByteArray QJsonDocument::toJson() const { return toJson(Indented); @@ -369,7 +369,7 @@ QByteArray QJsonDocument::toJson() const \sa fromJson(), JsonFormat */ -#ifndef QT_JSON_READONLY +#if !defined(QT_JSON_READONLY) || defined(Q_CLANG_QDOC) QByteArray QJsonDocument::toJson(JsonFormat format) const { QByteArray json; diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/json/qjsondocument.h index e1730cf374..b784890c54 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/json/qjsondocument.h @@ -131,9 +131,7 @@ public: 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 |