summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnection_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-11-23 12:31:27 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-11-06 09:39:57 +0000
commit1a0b4b9f26e16532cc3d5532e25d886426ce994e (patch)
treec48977079231dcbaf2186874cc93e2f313867501 /src/network/access/qhttpnetworkconnection_p.h
parentba3a26ea9f6206276e9f54c9c1efeea30a73c0c4 (diff)
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 <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
-rw-r--r--src/network/access/qhttpnetworkconnection_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 22376aa696..5558bccfde 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -70,7 +70,7 @@
#include <private/qhttpnetworkconnectionchannel_p.h>
-#ifndef QT_NO_HTTP
+QT_REQUIRE_CONFIG(http);
QT_BEGIN_NAMESPACE
@@ -290,6 +290,4 @@ public:
QT_END_NAMESPACE
-#endif // QT_NO_HTTP
-
#endif