From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-829573-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 D586D1397F2
	for <garchives@archives.gentoo.org>; Sat, 22 Aug 2015 01:56:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7B37CE088D;
	Sat, 22 Aug 2015 01:56:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 01CB1E088D
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Aug 2015 01:56:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 51077340909
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Aug 2015 01:56:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EC5A313B
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Aug 2015 01:56:50 +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: <1440208510.bf56ad3eaf6873584702a7b52d510cf5134fce84.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt4-build-multilib.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: bf56ad3eaf6873584702a7b52d510cf5134fce84
X-VCS-Branch: master
Date: Sat, 22 Aug 2015 01:56:50 +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: e183214d-fe66-4eb2-8ea5-7db1221ea1b8
X-Archives-Hash: 9ed418143c29c98a50bfceb60c347728

commit:     bf56ad3eaf6873584702a7b52d510cf5134fce84
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 01:36:19 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 01:55:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf56ad3e

qt4-build-multilib.eclass: support myqmakeargs.

See commit d74741b15fd18bd0f44cbd348a1752255ca19cb9

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qt4-build-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 3baed5d..ade46da 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -637,10 +637,10 @@ qt4_qmake() {
 	local projectdir=${PWD/#${BUILD_DIR}/${S}}
 
 	"${BUILD_DIR}"/bin/qmake \
+		"${projectdir}" \
 		CONFIG+=nostrip \
 		LIBS+=-L"${QT4_LIBDIR}" \
-		"${projectdir}" \
-		"$@" \
+		"${myqmakeargs[@]}" \
 		|| die "qmake failed (${projectdir#${S}/})"
 }