nativesdk-qtbase: Fix path for mkspecs in SDK
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 31 Oct 2014 17:04:26 +0000 (15:04 -0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:46:21 +0000 (08:46 -0800)
The mkspecs file needs to use the QT_DIR_NAME variable to
have a proper path to the files, fix it.

(From meta-qt5 rev: c1f6332cceee80ad2c3b4655c23b2c40d0268a5d)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc

index cf6b27b..6f1f880 100644 (file)
@@ -263,7 +263,7 @@ do_generate_qt_environment_file() {
     echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script
     echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
     echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script
-    echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/mkspecs/linux-oe-g++' >> $script
+    echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script
 
     # Use relocable sysroot
     sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script