AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the system proxies option default to being on.

Browse Source 
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>
This commit is contained in:
Andy Shaw 2016-05-13 11:05:09 +02:00
parent 70b8896833
commit 6d9f648d0e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_help.txt
View File

@ -366,8 +366,8 @@ Additional options:
1.0. GStreamer 1.0 is used by default when available. 1.0. GStreamer 1.0 is used by default when available.
Use 0.10 or 1.0 for <version> to override auto-detection. Use 0.10 or 1.0 for <version> to override auto-detection.
* -no-system-proxies ... Do not 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. * -system-proxies ...... Use system network proxies by default.
-no-warnings-are-errors Make warnings be treated normally -no-warnings-are-errors Make warnings be treated normally
-warnings-are-errors Make warnings be treated as errors -warnings-are-errors Make warnings be treated as errors

2
configure vendored
View File

@ -673,7 +673,7 @@ CFG_SLOG2=auto
CFG_PPS=auto CFG_PPS=auto
CFG_QNX_IMF=auto CFG_QNX_IMF=auto
CFG_LGMON=auto CFG_LGMON=auto
CFG_SYSTEM_PROXIES=no CFG_SYSTEM_PROXIES=yes
CFG_ANDROID_STYLE_ASSETS=yes CFG_ANDROID_STYLE_ASSETS=yes
CFG_GSTREAMER=auto CFG_GSTREAMER=auto
CFG_GSTREAMER_VERSION="" CFG_GSTREAMER_VERSION=""

2
tools/configure/configureapp.cpp
View File

@ -181,7 +181,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
dictionary[ "QNX_IMF" ] = "no"; dictionary[ "QNX_IMF" ] = "no";
dictionary[ "PPS" ] = "no"; dictionary[ "PPS" ] = "no";
dictionary[ "LGMON" ] = "no"; dictionary[ "LGMON" ] = "no";
dictionary[ "SYSTEM_PROXIES" ] = "no"; dictionary[ "SYSTEM_PROXIES" ] = "yes";
dictionary[ "WERROR" ] = "auto"; dictionary[ "WERROR" ] = "auto";
dictionary[ "QREAL" ] = "double"; dictionary[ "QREAL" ] = "double";
dictionary[ "ATOMIC64" ] = "auto"; dictionary[ "ATOMIC64" ] = "auto";