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/qhttp2protocolhandler_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/qhttp2protocolhandler_p.h')
-rw-r--r-- | src/network/access/qhttp2protocolhandler_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/access/qhttp2protocolhandler_p.h b/src/network/access/qhttp2protocolhandler_p.h index b52f8ae10c..45cc558df7 100644 --- a/src/network/access/qhttp2protocolhandler_p.h +++ b/src/network/access/qhttp2protocolhandler_p.h @@ -55,8 +55,6 @@ #include <private/qabstractprotocolhandler_p.h> #include <private/qhttpnetworkrequest_p.h> -#if !defined(QT_NO_HTTP) - #include "http2/http2protocol_p.h" #include "http2/http2streams_p.h" #include "http2/http2frames_p.h" @@ -75,6 +73,8 @@ #include <deque> #include <set> +QT_REQUIRE_CONFIG(http); + QT_BEGIN_NAMESPACE class QHttp2ProtocolHandler : public QObject, public QAbstractProtocolHandler @@ -210,6 +210,4 @@ private: QT_END_NAMESPACE -#endif // !defined(QT_NO_HTTP) - #endif |