diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-12-23 16:58:53 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-06-30 16:46:54 +0000 |
| commit | 9c43bb61349bb73563461819fa02255875c24201 (patch) | |
| tree | b7973aa837b66034c7dfeba7440e20971792cecf /src/network/access/qnetworkrequest.cpp | |
| parent | 3040eadd832b8dadaae04660047fdcd42519b0a2 (diff) | |
Network: Remove unneeded Q_QDOC check for http feature
http is enabled by default if you have threading support, which is true for qdoc. There is therefore no reason to believe that a normal
qdoc configuration won't have it configured, and hence no need to
check also explicitly for Q_QDOC.
Pick-to: 6.6
Change-Id: I118388fedaa87225ce81a211d361d593da61105d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index bf46e8a4b5..c99c5f05b8 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) { |