diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 12:31:27 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-11-06 09:39:57 +0000 |
commit | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (patch) | |
tree | c48977079231dcbaf2186874cc93e2f313867501 /src/network/access/qhttpnetworkrequest_p.h | |
parent | ba3a26ea9f6206276e9f54c9c1efeea30a73c0c4 (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/qhttpnetworkrequest_p.h')
-rw-r--r-- | src/network/access/qhttpnetworkrequest_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index 4fd973cf3f..2cbb8e255e 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -52,12 +52,12 @@ // #include <QtNetwork/private/qtnetworkglobal_p.h> -#ifndef QT_NO_HTTP - #include <private/qhttpnetworkheader_p.h> #include <QtNetwork/qnetworkrequest.h> #include <qmetatype.h> +QT_REQUIRE_CONFIG(http); + QT_BEGIN_NAMESPACE class QNonContiguousByteDevice; @@ -188,7 +188,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QHttpNetworkRequest) -#endif // QT_NO_HTTP - - #endif // QHTTPNETWORKREQUEST_H |