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 | |
| parent | 94284220ab3ae53980557f2fd75289c7454b1bb2 (diff) | |
qmake/qt build classes: make qmake and qmake2 coexist
| -rw-r--r-- | classes/qmake-base.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake.bbclass | 4 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 4a360dae43..36ecfb622f 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -16,6 +16,8 @@ export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc" +export OE_QMAKE_RCC="non-existant" +export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 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 diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index d4ca0073df..f0844d81e1 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -4,6 +4,8 @@ export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" |