[oe] [meta-qt5][PATCH] qtbase: Fix prefix substitution from OE to QT variable

[Khem Raj]

In recent commit c0cc4ff88292d1ddd9d30007e4947342d71ae77d
it was changed to replace STAGING_DIR_NATIVE and STAGING_DIR_HOST with
qmake variables, however there is a little difference between them and
they are not one to one mapped, OE sysroot variable does not contain
prefix (/usr) at the end but QT_INSTALL_PREFIX and QT_HOST_PREFIX does,
so we need to take care of substituting the full string, so qmake can
formulate the header and library search paths correctly. It fixes the
issue where qmake started to have wrong search paths with duplicated
<sysroot>/usr/usr/include/... added to compiler commandline and which
meant that compiler did not find the headers in sysroot while building
components like qtwebkit

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 recipes-qt/qt5/qtbase_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 006968b..18eee96 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -238,8 +238,8 @@ 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}| $$[QT_HOST_PREFIX]|g' \
-        -e 's| ${STAGING_DIR_HOST}| $$[QT_INSTALL_PREFIX]|g' \
+    sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \
+        -e 's| ${STAGING_EXECPREFIXDIR}| $$[QT_INSTALL_PREFIX]|g' \
         ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri
 }
 
-- 
1.9.1