diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-04-12 12:19:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-12 12:19:30 +0000 |
| commit | 0508f9f18820854586fbd3b56b85029d6cca03de (patch) | |
| tree | 49353aed6a180296092633f3006f220e77d2439d /classes/qmake.bbclass | |
| parent | 94284220ab3ae53980557f2fd75289c7454b1bb2 (diff) | |
qmake/qt build classes: make qmake and qmake2 coexist
Diffstat (limited to 'classes/qmake.bbclass')
| -rw-r--r-- | classes/qmake.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index 0d3f45c363..3a06b1af9f 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -47,9 +47,9 @@ qmake_do_configure() { oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" fi -#oenote "Calling 'qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" +#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" unset QMAKESPEC || true - qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" + ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" } EXPORT_FUNCTIONS do_configure |