aboutsummaryrefslogtreecommitdiffstats
path: root/classes/qmake5.bbclass
diff options
context:
space:
mode:
authorMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-04 16:32:32 -0800
committerMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-04 17:03:14 -0800
commit17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2 (patch)
tree0f7e16690a095d35904858580594c14ed12501b5 /classes/qmake5.bbclass
parent93fc33ea280a2fd060dc35b6d60e3d6a65968ccf (diff)
qtbase: mkspecs are now staged correctly
They are placed under STAGING_DATADIR as they need to be kept separate from the native side. The reason for doing so is that some qt modules require native tools and the mkspecs in STAGING_DATADIR_NATIVE cannot be polluted with the target mkspecs There are still some packaging issues Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Diffstat (limited to 'classes/qmake5.bbclass')
-rw-r--r--classes/qmake5.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index b30b1507..180cedcf 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}/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"