summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-10-31 15:04:26 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2014-10-31 17:56:50 -0200
commitc1f6332cceee80ad2c3b4655c23b2c40d0268a5d (patch)
tree10528a9b5badab8ab1eafdc814124a9a72a70e25
parent05213cd7ba5d1347ae2c73d51fc52d7af1fb6938 (diff)
downloadmeta-qt5-c1f6332cceee80ad2c3b4655c23b2c40d0268a5d.tar.gz
nativesdk-qtbase: Fix path for mkspecs in SDK
The mkspecs file needs to use the QT_DIR_NAME variable to have a proper path to the files, fix it. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index cf6b27bd..6f1f880b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -263,7 +263,7 @@ do_generate_qt_environment_file() {
263 echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script 263 echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script
264 echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script 264 echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
265 echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script 265 echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script
266 echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/mkspecs/linux-oe-g++' >> $script 266 echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script
267 267
268 # Use relocable sysroot 268 # Use relocable sysroot
269 sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script 269 sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script