summaryrefslogtreecommitdiff
path: root/openembedded/classes/qt4x11.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-09 16:10:46 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-09 16:10:46 +0000
commit189b9a916b845c90db5e51f62496a13f60936d36 (patch)
treee9227d9f63eea070317afffd41cbcdfed018753f /openembedded/classes/qt4x11.bbclass
parent8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c (diff)
downloadopenembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.gz
openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.bz2
openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.xz
openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.zip
Sync bbclass files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@374 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/qt4x11.bbclass')
-rw-r--r--openembedded/classes/qt4x11.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass
index d4ca0073d..04aff565b 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"