From 6d9f648d0ed591a0afba018adfbb089871f67b38 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 13 May 2016 11:05:09 +0200 Subject: [PATCH] Change the system proxies option default to being on. By changing the system proxies option default to being on, we set it to be the more natural default setting. This is down to the fact that people tend to assume that this is already the default option. [ChangeLog][Important Behavior Changes][QtNetwork] Proxies from system settings will now be used by default. Configure with -no-system-proxies to disable. Change-Id: Iec5bbde9dff1311ce44418f6aa024bda05388cf6 Reviewed-by: Kai Koehne Reviewed-by: Richard J. Moore Reviewed-by: Oswald Buddenhagen Reviewed-by: Peter Hartmann Reviewed-by: Frederik Gladhorn --- config_help.txt | 4 ++-- configure | 2 +- tools/configure/configureapp.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config_help.txt b/config_help.txt index f0f1d4ca070..c15083cc548 100644 --- a/config_help.txt +++ b/config_help.txt @@ -366,8 +366,8 @@ Additional options: 1.0. GStreamer 1.0 is used by default when available. Use 0.10 or 1.0 for to override auto-detection. - * -no-system-proxies ... Do not use system network proxies by default. - -system-proxies ...... Use system network proxies by default. + -no-system-proxies ... Do not use system network proxies by default. + * -system-proxies ...... Use system network proxies by default. -no-warnings-are-errors Make warnings be treated normally -warnings-are-errors Make warnings be treated as errors diff --git a/configure b/configure index 359de6c0eca..a9f3e0ab650 100755 --- a/configure +++ b/configure @@ -673,7 +673,7 @@ CFG_SLOG2=auto CFG_PPS=auto CFG_QNX_IMF=auto CFG_LGMON=auto -CFG_SYSTEM_PROXIES=no +CFG_SYSTEM_PROXIES=yes CFG_ANDROID_STYLE_ASSETS=yes CFG_GSTREAMER=auto CFG_GSTREAMER_VERSION="" diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7328f00a651..73eef1e4bda 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -181,7 +181,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "QNX_IMF" ] = "no"; dictionary[ "PPS" ] = "no"; dictionary[ "LGMON" ] = "no"; - dictionary[ "SYSTEM_PROXIES" ] = "no"; + dictionary[ "SYSTEM_PROXIES" ] = "yes"; dictionary[ "WERROR" ] = "auto"; dictionary[ "QREAL" ] = "double"; dictionary[ "ATOMIC64" ] = "auto";