From 1a0b4b9f26e16532cc3d5532e25d886426ce994e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2016 12:31:27 +0100 Subject: 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. Change-Id: I432fa3c78aa97b5ed2eb1027ac1dc3bdb134f9ba Reviewed-by: Edward Welbourne Reviewed-by: Oswald Buddenhagen --- src/network/access/qhttpnetworkrequest.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/network/access/qhttpnetworkrequest.cpp') diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index bd34ac7e05..3fcf946945 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -40,8 +40,6 @@ #include "qhttpnetworkrequest_p.h" #include "private/qnoncontiguousbytedevice_p.h" -#ifndef QT_NO_HTTP - QT_BEGIN_NAMESPACE QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op, @@ -395,5 +393,3 @@ int QHttpNetworkRequest::minorVersion() const QT_END_NAMESPACE -#endif - -- cgit v1.2.3