From c0cc4ff88292d1ddd9d30007e4947342d71ae77d Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 23 Aug 2015 22:16:49 +1000 Subject: qtbase: replace host paths with qmake built-in properties in qconfig.pri This avoids qconfig.pri in the Qt SDK incorrectly including paths from the build host that may not exist on the SDK host. As the paths are now correct, qmake can correctly detect system include paths and use -isystem instead of -I for Qt's include directories which allows the suppression of warnings from library headers when building Qt applications. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2c0a6e06..e1d208d1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -235,6 +235,11 @@ do_install_append() { # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps] 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}| $$[QT_HOST_PREFIX]|g' \ + -e 's| ${STAGING_DIR_HOST}| $$[QT_INSTALL_PREFIX]|g' \ + ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri } PACKAGES =. " \ -- cgit v1.2.3-54-g00ecf