From 8b8213afad892f559c57e4fa8e58290fd57cbd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 6 Dec 2018 18:31:54 +0100
Subject: [PATCH] qtbase: ship a valid qmake configuration in our cross sysroot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 appends/meta-qt5/qtbase_%.bbappend | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/appends/meta-qt5/qtbase_%.bbappend b/appends/meta-qt5/qtbase_%.bbappend
index 98db539..d90b807 100644
--- a/appends/meta-qt5/qtbase_%.bbappend
+++ b/appends/meta-qt5/qtbase_%.bbappend
@@ -4,3 +4,27 @@ PACKAGECONFIG_DISTRO += " \
     gtk \
     harfbuzz \
 "
+
+inherit instant-paths
+
+do_copytocrosssysroot_append() {
+    # ---------- qt.conf ----------
+    # create
+    generate_qt_config_file_paths
+    generate_qt_config_file_effective_paths
+
+    # copy to cross sysroot
+    cross_sysroot_qtconf="${INSTANT_CROSS_PATH}${OE_QMAKE_PATH_QT_BINS}/`basename ${OE_QMAKE_QTCONF_PATH}`"
+    cp -f ${OE_QMAKE_QTCONF_PATH} "$cross_sysroot_qtconf"
+    echo "$cross_sysroot_qtconf" >> ${INSTANT_MANIFEST}
+
+    # adjust to instant sysroot
+    qtconf_cross_sysroot=
+    sed -i \
+        -e 's:${STAGING_DIR_NATIVE}:${INSTANT_NATIVE_PATH}:g' \
+        -e 's:${STAGING_DIR_HOST}:${INSTANT_CROSS_PATH}:g' \
+        "$cross_sysroot_qtconf"
+
+    # ---------- mkspecs ----------
+
+}