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

[Davide Pesavento]

commit:     d74741b15fd18bd0f44cbd348a1752255ca19cb9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:33:03 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:33:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d74741b1

[qt5-build.eclass] New myqmakeargs variable to pass arguments to qmake from 
ebuilds.

 eclass/qt5-build.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 100a36c..a9dbe18 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -227,8 +227,10 @@ qt5-build_src_compile() {
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-       # '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
-       qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake 
SUBDIRS-=installed_cmake
+       # disable broken cmake tests (bug 474004)
+       local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake 
SUBDIRS-=installed_cmake)
+
+       qt5_foreach_target_subdir qt5_qmake
        qt5_foreach_target_subdir emake
 
        # create a custom testrunner script that correctly sets
@@ -663,6 +665,7 @@ qt5_qmake() {
        fi
 
        "${qmakepath}"/qmake \
+               "${projectdir}" \
                CONFIG+=$(usex debug debug release) \
                CONFIG-=$(usex debug release debug) \
                QMAKE_AR="$(tc-getAR) cqs" \
@@ -684,8 +687,7 @@ qt5_qmake() {
                QMAKE_LFLAGS="${LDFLAGS}" \
                QMAKE_LFLAGS_RELEASE= \
                QMAKE_LFLAGS_DEBUG= \
-               "${projectdir}" \
-               "$@" \
+               "${myqmakeargs[@]}" \
                || die "qmake failed (${projectdir#${S}/})"
 }