From ccdabe7fe5a126bdc8d9040182a367e6f9bb159f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 25 Nov 2020 22:54:08 +0000 Subject: [PATCH] remove the condition for system proxies support Signed-off-by: Ivailo Monev --- CMakeLists.txt | 1 - src/network/kernel/qnetworkproxy.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fe15af64..61fd4ee8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,7 +339,6 @@ set_package_properties(Unwind PROPERTIES add_definitions( # these conditionals are probably going to become default in the future -DQT_POSIX_IPC - -DQT_USE_SYSTEM_PROXIES # -DQT_STRICT_ITERATORS # -DQT_ASCII_CAST_WARNINGS # maybe one day, this forces it onto other projects which (most likely) diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 3227f5c94..362a2517e 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -241,9 +241,7 @@ public: , httpSocketEngineHandler(0) #endif { -#ifdef QT_USE_SYSTEM_PROXIES setApplicationProxyFactory(new QSystemConfigurationProxyFactory); -#endif #ifndef QT_NO_SOCKS5 socks5SocketEngineHandler = new QSocks5SocketEngineHandler(); #endif -- 2.11.0