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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     defdc0beecd17165377a994968d529fe77f88475
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec  9 16:06:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  9 16:40:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=defdc0be

[qt5-build.eclass] Simplify qt5_qmake() logic.

We can simply give qmake the dir where the .pro file is contained and
it'll work just fine. This allows us to work with project files named
differently than the directory in which they reside (e.g. qt-webkit).

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 023c95e..cf56c85 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -451,10 +451,9 @@ qt5_base_configure() {
 # Intended to be called by qt5_foreach_target_subdir().
 qt5_qmake() {
 	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
-	local projectfile=${projectdir}/${projectdir##*/}.pro
 
-	"${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \
-		|| die "qmake failed (${projectfile})"
+	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \
+		|| die "qmake failed (${projectdir})"
 }
 
 # @FUNCTION: qt5_foreach_target_subdir