From cba28bbc10627e70de53c146271e0d4b0e9324dc Mon Sep 17 00:00:00 2001
From: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Date: Mon, 3 Dec 2012 11:14:35 -0800
Subject: qtbase: use the correct tools from the native sysroot

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
---
 classes/qmake5.bbclass      | 2 +-
 classes/qmake5_base.bbclass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index b30b1507..0cde707a 100644
--- a/classes/qmake5.bbclass
+++ b/classes/qmake5.bbclass
@@ -6,7 +6,7 @@ inherit qmake5_base
 QT5TOOLSDEPENDS ?= "qt5-native "
 DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
 
-export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++"
+#export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc"
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index fc90429f..5601bb94 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -21,7 +21,7 @@ Prefix =
 Binaries = ${STAGING_BINDIR_NATIVE}
 Headers = ${STAGING_INCDIR}/qt5
 Plugins = ${STAGING_LIBDIR}/qt5/plugins/
-Libraries = ${STAGING_LIBDIR}/qt5-test
+Libraries = ${STAGING_LIBDIR}
 Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/
 HostData = ${STAGING_DATADIR_NATIVE}/qt5
 HostBinaries = ${STAGING_BINDIR_NATIVE}/
-- 
cgit v1.2.3-54-g00ecf