From 94ca12bf49ff6201b37476471403a5384b51b167 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 3 Apr 2013 16:51:02 +0200
Subject: [PATCH] qmake5_base: define both QMAKESPEC and let recipe select
 which one to use

* different platform/xplatform can enable cross-compile build in upstream qmake
  but that's not the same as what recipes are doing (upstream builds native tools
  when bootstraping target qtbase, recipes build native tools with separate
  qtbase-native and then want to skip building tools)
* still separate variables for both QMAKESPECs can be useful e.g. for
  other native recipes
---
 classes/qmake5_base.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index c91f7bd16c..ba13242cd2 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -1,6 +1,8 @@
-QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs"
+QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs"
+OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++"
+
+QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs"
 OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
-QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
 
 EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
 
@@ -13,7 +15,8 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \
              RCC="${OE_QMAKE_RCC}" \
              MAKE="make -e ${PARALLEL_MAKE}"'
 
-export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
+export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}"
+export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc"