1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off libproxy support by default

Browse Source 
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>
This commit is contained in:
Andy Shaw 2016-05-27 10:14:29 +02:00
parent bbf596890f
commit 5011b746f5
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

@ -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.

2
configure vendored
View File

@ -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

2
tools/configure/configureapp.cpp
View File

@ -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";