From 3bd297278dff1ae12d1241dc21e1e2643d7ccee2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Jan 2016 16:21:18 +0200 Subject: qtbase: re-enable replacing host paths in qconfig.pri Uncomment code that replaces host paths with qmake built-in properties in qconfig.pri. Modified to replace paths in all *.pri files in mkspecs directory and to also change paths without space in front of it. Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7ee5f562..8f519fa7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -222,9 +222,9 @@ do_install_append() { rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang # Replace host paths with qmake built-in properties -# sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \ -# -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \ -# ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri + sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \ + -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ + ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri } PACKAGES =. " \ -- cgit v1.2.3-54-g00ecf