{qt4e,qmake2}.bbclass: fix definition of QMAKESPEC

diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 8a443d062aede993d917049f961f5d7cc0bce9e3..9ced896fe886530a32d88e135f6c8fc17c3b30b1 100644 (file)
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -5,7 +5,7 @@ inherit qmake_base
 
 DEPENDS_prepend = "qmake2-native uicmoc4-native "
 
-export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
+export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index 8beef29df4c23680dbd81dc8c1e1ddc99e53db7e..e3d6fad7a0e89c28e4b050b666ece939d5446530 100644 (file)
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -4,6 +4,7 @@ inherit qmake2
 QT_DIR_NAME = "qtopia"
 # override variables set by qmake-base to compile Qt/Embedded apps
 #
+export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"