From 5011b746f5fd9ae93d0a60ec0517eb7d7e0e189c Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Fri, 27 May 2016 10:14:29 +0200
Subject: [PATCH] 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>
---
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 c15083cc548..ece83a2c9ad 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -187,8 +187,8 @@ Third Party Libraries:
+ -openssl ............. Enable run-time OpenSSL support.
-openssl-linked ...... Enabled linked OpenSSL support.
- -no-libproxy ......... Do not compile support for libproxy
- + -libproxy ............ Use libproxy from the operating system.
+ * -no-libproxy ......... Do not compile support for libproxy
+ -libproxy ............ Use libproxy from the operating system.
-qt-pcre ............. Use the PCRE library bundled with Qt.
+ -system-pcre ......... Use the PCRE library from the operating system.
diff --git a/configure b/configure
index a9f3e0ab650..a624b66225b 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
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 73eef1e4bda..d82f641d66c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -264,7 +264,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
dictionary[ "OPENGL_ES_2" ] = "yes";
dictionary[ "SSL" ] = "auto";
dictionary[ "OPENSSL" ] = "auto";
- dictionary[ "LIBPROXY" ] = "auto";
+ dictionary[ "LIBPROXY" ] = "no";
dictionary[ "DBUS" ] = "auto";
dictionary[ "STYLE_WINDOWS" ] = "yes";
--
GitLab