[oe-commits] Jeremy Lainé : {qt4e,qmake2}.bbclass: fix definition of QMAKESPEC

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6022c967ea47f26119de83af370cb066540bd0fc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6022c967ea47f26119de83af370cb066540bd0fc

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Mar 24 20:11:19 2009 +0100

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

---

 classes/qmake2.bbclass |    2 +-
 classes/qt4e.bbclass   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 8a443d0..9ced896 100644
--- 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 8beef29..e3d6fad 100644
--- 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"