From 5011b746f5fd9ae93d0a60ec0517eb7d7e0e189c Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 27 May 2016 10:14:29 +0200 Subject: 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 Reviewed-by: Robin Burchell Reviewed-by: Richard J. Moore --- config_help.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config_help.txt') 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. -- cgit v1.2.3