[oe] [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri

Jonathan Liu net147 at gmail.com
Sun Aug 23 12:16:49 UTC 2015


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 at gmail.com>
---
 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 ae63150..324a115 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -234,6 +234,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 =. " \
-- 
2.5.0




More information about the Openembedded-devel mailing list