From 2480300674bbd556246edf4988b08a779637d32e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 17 Aug 2017 15:05:00 +0300
Subject: meta-qt5: update meta layer

Pulls fix for qtwebengine

Change-Id: I80a3fc28cd016016f4af7cb9b4f38fb4f4155e1b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 scripts/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 2581772..502d7b2 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="41e4144d4d8c50b52ed6224a28f2ca4042c1e5b2"
+           revision="5bac910f95453d0df6fe540778dd16a9707dcabf"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
-- 
cgit v1.2.3-54-g00ecf


From 3720291ed255ef061aa231414b57848294e1e4f9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 18 Aug 2017 15:09:17 +0300
Subject: qtivi: export envs for ivigenerator

pip3 is run during install phase, so we need to have the environment
variables available also then.

Change-Id: I43aa285a5da884a0db4b651fb6a0eeb832daef51
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
---
 recipes-qt/automotive/qtivi_git.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 6b364d3..0f49d5d 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -68,7 +68,7 @@ PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}"
 
-do_compile_prepend() {
+set_python_paths() {
     # Otherwise pip might cache or reuse something from our home folder
     export HOME="${STAGING_DATADIR_NATIVE}"
     # This is needed as otherwise the virtualenv tries to use the libs from the host
@@ -76,6 +76,13 @@ do_compile_prepend() {
     # Let qtivi use the python3-native binaries
     export PYTHON3_PATH="${STAGING_BINDIR_NATIVE}/python3-native"
 }
+do_compile_prepend() {
+    set_python_paths
+}
+do_install_prepend() {
+    set_python_paths
+}
+
 
 BBCLASSEXTEND += "native nativesdk"
 
-- 
cgit v1.2.3-54-g00ecf