diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 12:31:27 +0100 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2018-03-01 15:46:06 +0000 |
| commit | eaa6eb5b842d2c8e378e6539b25fbfe3a7350acf (patch) | |
| tree | f38e1fbd1a912631236a14acee8fb8fde95ececd /src/network/access/qhttpnetworkreply.cpp | |
| parent | 4495a4d99adf5b078e3a783ced9265391bb4174e (diff) | |
| download | qtbase-eaa6eb5b842d2c8e378e6539b25fbfe3a7350acf.tar.gz | |
Modernize use of 'http' feature
Exclude QHttp(Multi)Part from being built if http is disabled, and
replace the exclusion macros. Use the qmake project files to exclude
source files, and QT_REQUIRE_CONFIG(http) in headers.
Task-number: QTBUG-66606
Change-Id: I432fa3c78aa97b5ed2eb1027ac1dc3bdb134f9ba
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from commit 1a0b4b9f26e16532cc3d5532e25d886426ce994e)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/network/access/qhttpnetworkreply.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 778ba821e8..a657346958 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -40,8 +40,6 @@ #include "qhttpnetworkreply_p.h" #include "qhttpnetworkconnection_p.h" -#ifndef QT_NO_HTTP - #ifndef QT_NO_SSL # include <QtNetwork/qsslkey.h> # include <QtNetwork/qsslcipher.h> @@ -1035,5 +1033,3 @@ void QHttpNetworkReply::ignoreSslErrors(const QList<QSslError> &errors) QT_END_NAMESPACE - -#endif // QT_NO_HTTP |