1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Network: Remove unneeded Q_QDOC check for http feature

Browse Source 
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.

Change-Id: I118388fedaa87225ce81a211d361d593da61105d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 9c43bb61349bb73563461819fa02255875c24201)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2022-12-23 16:58:53 +01:00 committed by Qt Cherry-pick Bot
parent 08c1f77c9a
commit 4756d5bb6c
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/access/qhttp1configuration.h
View File

@ -9,9 +9,7 @@
#include <utility>
#include <cstdint>
#ifndef Q_CLANG_QDOC
QT_REQUIRE_CONFIG(http);
#endif
QT_BEGIN_NAMESPACE

2
src/network/access/qhttp2configuration.h
View File

@ -8,9 +8,7 @@
#include <QtCore/qshareddata.h>
#ifndef Q_QDOC
QT_REQUIRE_CONFIG(http);
#endif
QT_BEGIN_NAMESPACE

10
src/network/access/qnetworkrequest.cpp
View File

@ -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)
{

8
src/network/access/qnetworkrequest.h
View File

@ -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<QNetworkRequestPrivate> d;
friend class QNetworkRequestPrivate;