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 <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Samuli Piippo
2016-01-12 16:21:18 +02:00
committed by Martin Jansa
parent 3e2058f2e7
commit 3bd297278d

View File

@@ -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 =. " \