diff options
| author | Jonathan Liu <net147@gmail.com> | 2015-08-23 22:16:49 +1000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-26 17:12:26 +0200 |
| commit | c0cc4ff88292d1ddd9d30007e4947342d71ae77d (patch) | |
| tree | 2d4dd0ebb3da436ce47c84dffcd354771342f3f7 /recipes-qt/qt5/qtbase_git.bb | |
| parent | b758a8f6600c1f4ca38df559fc4be6bd3ad53624 (diff) | |
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 <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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 =. " \ |