diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2016-05-27 10:14:29 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2016-05-27 20:03:55 +0000 |
| commit | 5011b746f5fd9ae93d0a60ec0517eb7d7e0e189c (patch) | |
| tree | c16ddc88b69ec8cecffeaea1ca062a0a406fa0e7 | |
| parent | bbf596890f5c351241cda4cd2a9dc050ceda3e51 (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>
| -rw-r--r-- | config_help.txt | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config_help.txt b/config_help.txt index c15083cc54..ece83a2c9a 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. @@ -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 73eef1e4bd..d82f641d66 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"; |