Add QNetworkProxyFactory::setUseSystemConfigurationEnabled(true)

Simply following the system configuration for the proxy used to require
writing a QNetworkProxyFactory subclass. The static setter makes this
easier, so apps can in one line say "I want to use the system proxy
settings". Solution and method name suggested by Thiago.

1 files changed, 24 insertions, 0 deletions

diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index af8d6fb..908f01f 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -220,6 +220,7 @@
 
 #ifndef QT_NO_NETWORKPROXY
 
+#include "private/qnetworkproxy_p.h"
 #include "private/qsocks5socketengine_p.h"
 #include "private/qhttpsocketengine_p.h"
 #include "qauthenticator.h"
@@ -1156,6 +1157,29 @@ QNetworkProxyFactory::~QNetworkProxyFactory()
 {
 }
 
+
+/*!
+    Enables the use of the platform-specific proxy settings, and only those.
+    See systemProxyForQuery() for more information.
+
+    Internally, this method (when called with \a enable set to true)
+    sets an application-wide proxy factory. For this reason, this method
+    is mutually exclusive with setApplicationProxyFactory: calling
+    setApplicationProxyFactory overrides the use of the system-wide proxy,
+    and calling setUseSystemConfigurationEnabled overrides any
+    application proxy or proxy factory that was previously set.
+
+    \since 4.6
+*/
+void QNetworkProxyFactory::setUseSystemConfigurationEnabled(bool enable)
+{
+    if (enable) {
+        setApplicationProxyFactory(new QSystemConfigurationProxyFactory);
+    } else {
+        setApplicationProxyFactory(0);
+    }
+}
+
 /*!
     Sets the application-wide proxy factory to be \a factory. This
     function will take ownership of that object and will delete it