qmake/qt build classes: make qmake and qmake2 coexist

diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass
index 4a360da..36ecfb6 100644 (file)
--- 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 0d3f45c..3a06b1a 100644 (file)
--- 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 d4ca007..f0844d8 100644 (file)
--- 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"