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/socket | |
| 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/socket')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qhttpsocketengine_p.h | 4 | ||||
| -rw-r--r-- | src/network/socket/socket.pri | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 082fb94e0a..b543ea7981 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -46,7 +46,7 @@ #include "qelapsedtimer.h" #include "qnetworkinterface.h" -#if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP) +#if !defined(QT_NO_NETWORKPROXY) #include <qdebug.h> QT_BEGIN_NAMESPACE @@ -866,4 +866,4 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(qintptr, QOb QT_END_NAMESPACE -#endif +#endif // !QT_NO_NETWORKPROXY diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index c8863f1fb5..cb7798694a 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/src/network/socket/qhttpsocketengine_p.h @@ -57,9 +57,11 @@ #include "qnetworkproxy.h" #include "private/qauthenticator_p.h" +QT_REQUIRE_CONFIG(http); + QT_BEGIN_NAMESPACE -#if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP) +#if !defined(QT_NO_NETWORKPROXY) class QTcpSocket; class QHttpNetworkReply; 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) { |