summaryrefslogtreecommitdiffstats
path: root/config_help.txt
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2016-05-13 11:05:09 +0200
committerAndy Shaw <andy.shaw@qt.io>2016-05-25 13:57:25 +0000
commit6d9f648d0ed591a0afba018adfbb089871f67b38 (patch)
treed09144677b34d07e361b6b09b2375217657b3b73 /config_help.txt
parent70b889683339aa3fc7a444e9228f727fa33803fa (diff)
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 <kai.koehne@qt.io> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'config_help.txt')
-rw-r--r--config_help.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt
index f0f1d4ca07..c15083cc54 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 <version> 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