aboutsummaryrefslogtreecommitdiffstats
path: root/classes/qt4x11.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-11-29 11:34:04 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-11-29 11:34:04 +0000
commit081432e434818a616a523f9f2bb18e707e4e68e3 (patch)
tree66e473e317db4a0f1056c474b26fdefde6e6ec6e /classes/qt4x11.bbclass
parent12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e (diff)
downloadopenembedded-081432e434818a616a523f9f2bb18e707e4e68e3.tar.gz
openembedded-081432e434818a616a523f9f2bb18e707e4e68e3.tar.bz2
openembedded-081432e434818a616a523f9f2bb18e707e4e68e3.zip
Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet.
Diffstat (limited to 'classes/qt4x11.bbclass')
-rw-r--r--classes/qt4x11.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 635fc67694..cb836cc362 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -5,10 +5,10 @@ DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-fr
#
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_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
export OE_QMAKE_LINK = "${CXX}"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"