AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build without features.networkproxy

Browse Source 
Change-Id: Ie0868b2d2ec30513e870861514b252a79dff4998
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tasuku Suzuki 2017-01-18 23:59:13 +09:00 committed by Stephan Binner
parent 5106d496f3
commit 179fe5981f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/configure.json
View File

@ -212,7 +212,7 @@
"label": "SOCKS5", "label": "SOCKS5",
"purpose": "Provides SOCKS5 support in QNetworkProxy.", "purpose": "Provides SOCKS5 support in QNetworkProxy.",
"section": "Networking", "section": "Networking",
"condition": "!config.winrt", "condition": "!config.winrt && features.networkproxy",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"networkinterface": { "networkinterface": {

11
src/network/socket/socket.pri
View File

@ -2,7 +2,6 @@
HEADERS += socket/qabstractsocketengine_p.h \ HEADERS += socket/qabstractsocketengine_p.h \
socket/qhttpsocketengine_p.h \ socket/qhttpsocketengine_p.h \
socket/qsocks5socketengine_p.h \
socket/qabstractsocket.h \ socket/qabstractsocket.h \
socket/qabstractsocket_p.h \ socket/qabstractsocket_p.h \
socket/qtcpsocket.h \ socket/qtcpsocket.h \
@ -17,7 +16,6 @@ HEADERS += socket/qabstractsocketengine_p.h \
SOURCES += socket/qabstractsocketengine.cpp \ SOURCES += socket/qabstractsocketengine.cpp \
socket/qhttpsocketengine.cpp \ socket/qhttpsocketengine.cpp \
socket/qsocks5socketengine.cpp \
socket/qabstractsocket.cpp \ socket/qabstractsocket.cpp \
socket/qtcpsocket.cpp \ socket/qtcpsocket.cpp \
socket/qudpsocket.cpp \ socket/qudpsocket.cpp \
@ -25,6 +23,15 @@ SOURCES += socket/qabstractsocketengine.cpp \
socket/qlocalsocket.cpp \ socket/qlocalsocket.cpp \
socket/qlocalserver.cpp socket/qlocalserver.cpp
# SOCK5 support.
qtConfig(socks5) {
HEADERS += \
socket/qsocks5socketengine_p.h
SOURCES += \
socket/qsocks5socketengine.cpp
}
# SCTP support. # SCTP support.
qtConfig(sctp) { qtConfig(sctp) {