diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-10-18 15:52:47 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-10-20 23:22:55 -0200 |
| commit | 51a4cdf3fcdc132cc7b5af0e240c5d1007e43590 (patch) | |
| tree | f5a20a6ef32ba1668a9556761663703e2a9ea0d4 | |
| parent | 2f1b8fe630ac76c8ff5d184f109449b10fde5a92 (diff) | |
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 12f5a543..09f3d9af 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/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 |