From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-526324-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 8CEC91381F3
	for <garchives@archives.gentoo.org>; Thu, 22 Nov 2012 11:00:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1EB9821C007;
	Thu, 22 Nov 2012 11:00:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A1D5C21C007
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2012 11:00:41 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id B42D833D90D
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2012 11:00:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id D9BBDE5436
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Nov 2012 11:00:38 +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: <1353581980.e9f4c22a688b93dbc76ccccf47460740e9206eae.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: e9f4c22a688b93dbc76ccccf47460740e9206eae
X-VCS-Branch: master
Date: Thu, 22 Nov 2012 11:00:38 +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: 4863950b-76cf-42c3-8c9c-4a0aeb389c76
X-Archives-Hash: c04b59ea6484199de0bbd6d041aa33f4

commit:     e9f4c22a688b93dbc76ccccf47460740e9206eae
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Nov 22 10:59:40 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 10:59:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e9f4c22a

[qt5-build.eclass] Use the new qmldir configure option.

---
 eclass/qt5-build.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ffaa022..1bde393 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -327,6 +327,7 @@ qt5_prepare_env() {
 	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
 	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
+	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
 	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
@@ -369,6 +370,7 @@ qt5_base_configure() {
 		-archdatadir "${QT5_ARCHDATADIR}"
 		-plugindir "${QT5_PLUGINDIR}"
 		-importdir "${QT5_IMPORTDIR}"
+		-qmldir "${QT5_QMLDIR}"
 		-datadir "${QT5_DATADIR}"
 		-docdir "${QT5_DOCDIR}"
 		-translationdir "${QT5_TRANSLATIONDIR}"