summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2016-05-27 10:14:29 +0200
committerAndy Shaw <andy.shaw@qt.io>2016-05-27 20:03:55 +0000
commit5011b746f5fd9ae93d0a60ec0517eb7d7e0e189c (patch)
treec16ddc88b69ec8cecffeaea1ca062a0a406fa0e7 /configure
parentbbf596890f5c351241cda4cd2a9dc050ceda3e51 (diff)
Turn off libproxy support by default
Since the system proxies are on by default now then we turn off libproxy support by default so that there is no risk of a conflict occurring. For instance on Linux, it is possible that libproxy indirectly causes KDE 4 libraries to be loaded which will cause a conflict with the Qt 5 libraries. Therefore we turn it off by default, since the system proxy setting is the overall better one to have. [ChangeLog][Important Behavior Changes][QtNetwork] libproxy is now turned off by default. Configure with -libproxy in order to enable it again. Task-number: QTBUG-53649 Change-Id: I0c6c5b9091dc2b2b7662fd44f2a1b49c622e563f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a9f3e0ab65..a624b66225 100755
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ CFG_GLIB=auto
CFG_GTK=auto
CFG_LARGEFILE=yes
CFG_OPENSSL=auto
-CFG_LIBPROXY=auto
+CFG_LIBPROXY=no
CFG_SECURETRANSPORT=auto
CFG_PRECOMPILE=auto
CFG_LTCG=no