diff --git a/src/network/access/qhttp1configuration.h b/src/network/access/qhttp1configuration.h index 4b66745f54a..128b8aa5aac 100644 --- a/src/network/access/qhttp1configuration.h +++ b/src/network/access/qhttp1configuration.h @@ -9,9 +9,7 @@ #include #include -#ifndef Q_CLANG_QDOC QT_REQUIRE_CONFIG(http); -#endif QT_BEGIN_NAMESPACE diff --git a/src/network/access/qhttp2configuration.h b/src/network/access/qhttp2configuration.h index 4b3b7d54a25..ae08b664d45 100644 --- a/src/network/access/qhttp2configuration.h +++ b/src/network/access/qhttp2configuration.h @@ -8,9 +8,7 @@ #include -#ifndef Q_QDOC QT_REQUIRE_CONFIG(http); -#endif QT_BEGIN_NAMESPACE diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index bf46e8a4b5e..c99c5f05b86 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -6,7 +6,7 @@ #include "qplatformdefs.h" #include "qnetworkcookie.h" #include "qsslconfiguration.h" -#if QT_CONFIG(http) || defined(Q_QDOC) +#if QT_CONFIG(http) #include "qhttp1configuration.h" #include "qhttp2configuration.h" #include "private/http2protocol_p.h" @@ -859,7 +859,7 @@ void QNetworkRequest::setPeerVerifyName(const QString &peerName) d->peerVerifyName = peerName; } -#if QT_CONFIG(http) || defined(Q_QDOC) +#if QT_CONFIG(http) /*! \since 6.5 @@ -969,9 +969,9 @@ void QNetworkRequest::setDecompressedSafetyCheckThreshold(qint64 threshold) { d->decompressedSafetyCheckThreshold = threshold; } -#endif // QT_CONFIG(http) || defined(Q_QDOC) +#endif // QT_CONFIG(http) -#if QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) +#if QT_CONFIG(http) || defined (Q_OS_WASM) /*! \since 5.15 @@ -1005,7 +1005,7 @@ void QNetworkRequest::setTransferTimeout(int timeout) { d->transferTimeout = timeout; } -#endif // QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) +#endif // QT_CONFIG(http) || defined (Q_OS_WASM) static QByteArray headerName(QNetworkRequest::KnownHeaders header) { diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 3476aa02736..2e7456b9a52 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -144,7 +144,7 @@ public: QString peerVerifyName() const; void setPeerVerifyName(const QString &peerName); -#if QT_CONFIG(http) || defined(Q_QDOC) +#if QT_CONFIG(http) QHttp1Configuration http1Configuration() const; void setHttp1Configuration(const QHttp1Configuration &configuration); @@ -153,12 +153,12 @@ public: qint64 decompressedSafetyCheckThreshold() const; void setDecompressedSafetyCheckThreshold(qint64 threshold); -#endif // QT_CONFIG(http) || defined(Q_QDOC) +#endif // QT_CONFIG(http) -#if QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) +#if QT_CONFIG(http) || defined (Q_OS_WASM) int transferTimeout() const; void setTransferTimeout(int timeout = DefaultTransferTimeoutConstant); -#endif // QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) +#endif // QT_CONFIG(http) || defined (Q_OS_WASM) private: QSharedDataPointer d; friend class QNetworkRequestPrivate;