From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-886815-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 0681A13829C
for <garchives@archives.gentoo.org>; Sun, 12 Jun 2016 01:20:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0428EE094B;
Sun, 12 Jun 2016 01:19:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5CCBBE094B
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 01:19:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 86004340B29
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 01:19:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BFA916C5
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 01:19:48 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1465694360.16f4d6943bb41fb765fc32cde06ba7bcdbe1e83f.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt5-build.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 16f4d6943bb41fb765fc32cde06ba7bcdbe1e83f
X-VCS-Branch: master
Date: Sun, 12 Jun 2016 01:19:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: aede7c94-7d74-4600-ad93-de78f643334b
X-Archives-Hash: 5138880d5adaa0d7b672267c53f1169a
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