From f7893223e84db86dcdd860c625663d7006fcdad6 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <phartmann@rim.com>
Date: Tue, 23 Oct 2012 15:31:20 +0200
Subject: QtNetwork: introduce configure switch to use system proxies by
 default

This option is opt-in (default: no). When configured with
"-proxies-system-default", Qt automatically picks up the system
proxies.

Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/network/socket/socket.pri | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/network/socket/socket.pri')

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
+}
-- 
cgit v1.2.3