[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     16f4d6943bb41fb765fc32cde06ba7bcdbe1e83f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 01:19:20 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 01:19:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=16f4d694

qt5-build.eclass: sync with gentoo.git

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 47c121d..9b1a4ab 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -647,8 +647,9 @@ qt5_base_configure() {
                # disable gstreamer by default, override in qtmultimedia
                -no-gstreamer
 
-               # use upstream default
-               #-no-system-proxies
+               # respect system proxies by default: it's the most natural
+               # setting, and it'll become the new upstream default in 5.8
+               $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -system-proxies)
 
                # do not build with -Werror
                -no-warnings-are-errors