Sync bbclass files with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@374 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 6 insertions, 1 deletions

diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass
index d4ca0073df..04aff565be 100644
--- a/openembedded/classes/qt4x11.bbclass
+++ b/openembedded/classes/qt4x11.bbclass
@@ -1,9 +1,14 @@
+DEPENDS_prepend = "qmake2-native "
 #
-# override variables set by qmake-base to compile Qt/X11 apps
+# override variables set by qmake-base to compile Qt4/X11 apps
 #
 export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
 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_LINK="${CXX}"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"