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/qspdyprotocolhandler_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/network/access/qspdyprotocolhandler_p.h') diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h index bfc2390ccc..dd93a9aba2 100644 --- a/src/network/access/qspdyprotocolhandler_p.h +++ b/src/network/access/qspdyprotocolhandler_p.h @@ -58,7 +58,9 @@ #include -#if !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) +QT_REQUIRE_CONFIG(http); + +#if !defined(QT_NO_SSL) QT_BEGIN_NAMESPACE @@ -223,6 +225,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::SETTINGS_ID_Flags) QT_END_NAMESPACE -#endif // !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) +#endif // !defined(QT_NO_SSL) #endif // QSPDYPROTOCOLHANDLER_H -- cgit v1.2.3