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/socket/socket.pri | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/network/socket/socket.pri') diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index b2ee1a8054..a8a37492b7 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -1,7 +1,6 @@ # Qt network socket HEADERS += socket/qabstractsocketengine_p.h \ - socket/qhttpsocketengine_p.h \ socket/qabstractsocket.h \ socket/qabstractsocket_p.h \ socket/qtcpsocket.h \ @@ -11,7 +10,6 @@ HEADERS += socket/qabstractsocketengine_p.h \ socket/qtcpserver_p.h SOURCES += socket/qabstractsocketengine.cpp \ - socket/qhttpsocketengine.cpp \ socket/qabstractsocket.cpp \ socket/qtcpsocket.cpp \ socket/qudpsocket.cpp \ @@ -26,6 +24,13 @@ qtConfig(socks5) { socket/qsocks5socketengine.cpp } +qtConfig(http) { + HEADERS += \ + socket/qhttpsocketengine_p.h + SOURCES += \ + socket/qhttpsocketengine.cpp +} + # SCTP support. qtConfig(sctp) { -- cgit v1.2.3