qtivi: rebase patch for 5.11 and 5.12

Change-Id: Ie0a7e6ef235c2bd5c19b802c44d3a084843d0042
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

1 files changed, 11 insertions, 7 deletions

diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
index 9f6c0c0..256f706 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
@@ -1,4 +1,4 @@
-From b4ed8c9d4a391771cba485bfa685147126260dc2 Mon Sep 17 00:00:00 2001
+From 2d99a2a0c728cb28332fb35dac3af88b0f256116 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 7 Sep 2017 10:24:11 +0300
 Subject: [PATCH] Use QT_HOST_BINS/get for getting correct path
@@ -8,22 +8,26 @@ the EffectivePath instead of installation path.
 
 Change-Id: I3e9c04019c432e182dcb5c0898275173f20de1e2
 ---
- mkspecs/features/ivigenerator.prf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ mkspecs/features/ivigenerator.prf | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf
-index 65c497e..7634355 100644
+index 8d36aae..149116c 100644
 --- a/mkspecs/features/ivigenerator.prf
 +++ b/mkspecs/features/ivigenerator.prf
-@@ -31,9 +31,9 @@ QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml
- OTHER_FILES += $$QFACE_FILE
+@@ -36,9 +36,11 @@ equals(QMAKE_HOST.os, Windows): ENV = chcp 65001 &&
+ else: ENV = LC_ALL="en_US.UTF-8"
  
  # Detect whether we are using the feature inside the qtivi repository
 -VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv
 +VIRTUALENV_PATH = $$[QT_HOST_BINS/get]/ivigenerator/qtivi_qface_virtualenv
  INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv
--IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator
+ IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator
 +IVI_GENERATOR_PATH = $$[QT_HOST_BINS/get]/ivigenerator
++
  QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT))
  
  # Try to use the internal virtualenv when building qtivi
+-- 
+2.17.1
+