diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 3 | ||||
| -rw-r--r-- | src/network/socket/socket.pri | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index adaefac440..85641895b7 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -253,6 +253,9 @@ public: , httpSocketEngineHandler(0) #endif { +#ifdef QT_USE_SYSTEM_PROXIES + setApplicationProxyFactory(new QSystemConfigurationProxyFactory); +#endif #ifndef QT_NO_SOCKS5 socks5SocketEngineHandler = new QSocks5SocketEngineHandler(); #endif diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index 3429275a67..0204a92999 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -60,3 +60,7 @@ integrity: { DEFINES += QT_LOCALSOCKET_TCP } + +contains(QT_CONFIG, system-proxies) { + DEFINES += QT_USE_SYSTEM_PROXIES +} |