From c7498b55730f48f766a7dfb95a7663700f710785 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2014 15:52:47 -0300 Subject: [PATCH] nativesdk-qtbase: Fix qtconfig.pri The value used in the new environment subscript tried to use a target variable which might not be accurate; use qmake to ask for the right value for OE_QMAKE_QT_CONFIG variable. (From meta-qt5 rev: 51a4cdf3fcdc132cc7b5af0e240c5d1007e43590) Signed-off-by: Otavio Salvador Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc index 12f5a54..09f3d9a 100644 --- a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc @@ -240,7 +240,7 @@ do_generate_qt_environment_file() { echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script - echo 'export OE_QMAKE_QT_CONFIG=${OE_QMAKE_PATH_TARGET_LIBS}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script + echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/mkspecs/linux-oe-g++' >> $script # Use relocable sysroot -- 2.7.4