From 6022c967ea47f26119de83af370cb066540bd0fc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Tue, 24 Mar 2009 20:11:19 +0100
Subject: [PATCH] {qt4e,qmake2}.bbclass: fix definition of QMAKESPEC

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

diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 8a443d062a..9ced896fe8 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 8beef29df4..e3d6fad7a0 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"
-- 
2.39.5