Merge remote-tracking branch 'origin/thud' into warrior

* origin/thud:
  c0a7da2 meta-qt5: update layer
  981e020 Merge remote-tracking branch 'origin/5.13.1_QtAS' into thud
  e2c736d gstreamer1.0-libav: fix video plaback for imx7
  ad18456 qtdeviceutilities: update to latest revision
  56124e6 Fix for ivigenerator use in boot2qt on windows platform
  37adc03 Update automotive sha1s for QtAS 5.13.1
  dc46e3a mingw: Fix bad cmd flag
  3493d88 Update automotive sha1s for QtAS 5.13.1
  9389e4d qtlocation: enable all geoservice plugins
  b0e091b qtsaferenderer: fix installation of missing plugin
  9feff5a Update automotive sha1s for QtAS 5.13.1
  f52d40b neptune: hide mouse cursor
  9ceef53 Update automotive sha1s for QtAS 5.13.1
  56e11a8 [qsr] new qsr and neptune services switching, set display for qsr
  51e55f1 Update automotive sha1s for QtAS 5.13.1
  de8d69f  Update automotive sha1s for QtAS 5.13.1

Conflicts:
  meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
  scripts/manifest.xml

Change-Id: Ibb2d8ad5bb8fd4419eda3d85af1df9f58e31d8dc

18 files changed, 272 insertions, 12 deletions

diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 829fdc1c..5a4c7e6d 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -77,3 +77,4 @@ COPY_LIC_MANIFEST = "1"
 
 include conf/distro/include/b2qt.inc
 include conf/distro/include/${MACHINE}.conf
+include conf/distro/include/preferred-providers-${SDK_OS}.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc b/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc
new file mode 100644
index 00000000..28dc3a71
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc
@@ -0,0 +1,9 @@
+PREFERRED_PROVIDER_nativesdk-antlr4-python3-runtime ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3 ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-jinja2 ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-markupsafe ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-path.py ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-pathtools ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-qface ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-setuptools-scm ?= "nativesdk-prebuild-python"
+PREFERRED_PROVIDER_nativesdk-python3-watchdog ?= "nativesdk-prebuild-python"
diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
new file mode 100644
index 00000000..fc6e2b7b
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
@@ -0,0 +1,105 @@
+From 5a7179ec8319339b619d4c3ec73ea090794483d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Thu, 31 Aug 2017 12:06:44 +0300
+Subject: [PATCH] arm: Fix SIGBUS on ARM when compiled with binutils 2.29
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In binutils 2.29, the behavior of the ADR instruction changed so that 1 is
+added to the address of a Thumb function (previously nothing was added). This
+allows the loaded address to be passed to a BLX instruction and the correct
+mode change will occur.
+
+See: https://sourceware.org/bugzilla/show_bug.cgi?id=21458
+
+By using adr with a label that isn't annotated as a thumb function,
+we avoid the new behaviour in binutils 2.29 and get the same behaviour
+as in prior releases, and as in other assemblers (ms armasm.exe,
+clang's built in assembler) - an idea that Janne Grunau came up with.
+
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ .../ext/libav/libavcodec/arm/h264idct_neon.S  | 20 +++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/gst-libs/ext/libav/libavcodec/arm/h264idct_neon.S b/gst-libs/ext/libav/libavcodec/arm/h264idct_neon.S
+index 4f68bdb..93859db 100644
+--- a/gst-libs/ext/libav/libavcodec/arm/h264idct_neon.S
++++ b/gst-libs/ext/libav/libavcodec/arm/h264idct_neon.S
+@@ -21,6 +21,7 @@
+ #include "libavutil/arm/asm.S"
+ 
+ function ff_h264_idct_add_neon, export=1
++h264_idct_add_neon_nothumb:
+         vld1.64         {d0-d3},  [r1,:128]
+         vmov.i16        q15, #0
+ 
+@@ -73,6 +74,7 @@ function ff_h264_idct_add_neon, export=1
+ endfunc
+ 
+ function ff_h264_idct_dc_add_neon, export=1
++h264_idct_dc_add_neon_nothumb:
+         mov             r3,       #0
+         vld1.16         {d2[],d3[]}, [r1,:16]
+         strh            r3,       [r1]
+@@ -113,8 +115,8 @@ function ff_h264_idct_add16_neon, export=1
+         movne           lr,  #0
+         cmp             lr,  #0
+         ite             ne
+-        adrne           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
+-        adreq           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
++        adrne           lr,  h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
++        adreq           lr,  h264_idct_add_neon_nothumb    + CONFIG_THUMB
+         blx             lr
+ 2:      subs            ip,  ip,  #1
+         add             r1,  r1,  #32
+@@ -138,8 +140,8 @@ function ff_h264_idct_add16intra_neon, export=1
+         cmp             r8,  #0
+         ldrsh           r8,  [r1]
+         iteet           ne
+-        adrne           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
+-        adreq           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++        adrne           lr,  h264_idct_add_neon_nothumb    + CONFIG_THUMB
++        adreq           lr,  h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+         cmpeq           r8,  #0
+         blxne           lr
+         subs            ip,  ip,  #1
+@@ -166,8 +168,8 @@ function ff_h264_idct_add8_neon, export=1
+         cmp             r8,  #0
+         ldrsh           r8,  [r1]
+         iteet           ne
+-        adrne           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
+-        adreq           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++        adrne           lr,  h264_idct_add_neon_nothumb    + CONFIG_THUMB
++        adreq           lr,  h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+         cmpeq           r8,  #0
+         blxne           lr
+         add             r12, r12, #1
+@@ -267,6 +269,7 @@ endfunc
+ .endm
+ 
+ function ff_h264_idct8_add_neon, export=1
++h264_idct8_add_neon_nothumb:
+         vmov.i16        q3,       #0
+         vld1.16         {q8-q9},  [r1,:128]
+         vst1.16         {q3},     [r1,:128]!
+@@ -328,6 +331,7 @@ function ff_h264_idct8_add_neon, export=1
+ endfunc
+ 
+ function ff_h264_idct8_dc_add_neon, export=1
++h264_idct8_dc_add_neon_nothumb:
+         mov             r3,       #0
+         vld1.16         {d30[],d31[]},[r1,:16]
+         strh            r3,       [r1]
+@@ -388,8 +392,8 @@ function ff_h264_idct8_add4_neon, export=1
+         movne           lr,  #0
+         cmp             lr,  #0
+         ite             ne
+-        adrne           lr,  X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
+-        adreq           lr,  X(ff_h264_idct8_add_neon)    + CONFIG_THUMB
++        adrne           lr,  h264_idct8_dc_add_neon_nothumb + CONFIG_THUMB
++        adreq           lr,  h264_idct8_add_neon_nothumb    + CONFIG_THUMB
+         blx             lr
+ 2:      subs            r12, r12, #4
+         add             r1,  r1,  #128
diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend
new file mode 100644
index 00000000..c6322b88
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
index c7112cfa..59f0d552 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
@@ -28,8 +28,10 @@
 ############################################################################
 
 PACKAGECONFIG += " \
-    geoservices_mapbox \
+    geoservices_esri \
+    geoservices_here \
     geoservices_itemsoverlay \
+    geoservices_mapbox \
     geoservices_mapboxgl \
+    geoservices_osm \
 "
-
diff --git a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
index 3d8c083f..f7c33a13 100644
--- a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
@@ -39,15 +39,64 @@ PV = "3.5.2"
 
 S = "${WORKDIR}"
 
+PROVIDES += " \
+    python3 \
+    python3-watchdog \
+    python3-path.py \
+    antlr4-python3-runtime \
+    python3-jinja2 \
+    python3-markupsafe \
+    qface \
+    "
+
+RPROVIDES_${PN} += " \
+    python3-pkgutil \
+    python3-xml \
+    python3-crypt \
+    python3-compile \
+    python3-netserver \
+    python3-compression \
+    python3-numbers \
+    python3-unittest \
+    python3-netclient \
+    python3-math \
+    python3-ctypes \
+    python3-html \
+    python3-json \
+    python3-datetime \
+    python3-distutils \
+    python3-shell \
+    python3-stringold \
+    python3-email \
+    python3-threading \
+    python3-pprint \
+    python3-plistlib \
+    python3-io \
+    python3-pickle \
+    \
+    qface \
+    python3-jinja2 \
+    python3-watchdog \
+    python3-path.py \
+    python3-markupsafe \
+    antlr4-python3-runtime \
+    "
+
 do_install() {
     install -d ${D}${includedir}/${PYTHON_DIR}
     install -m 0644 ${S}/include/* ${D}${includedir}/${PYTHON_DIR}
 
+    install -d ${D}${bindir}
     install -d ${D}${libdir}
+    install -d ${D}${libdir}/${PYTHON_DIR}
     install -m 0644 ${S}/libs/*.a ${D}${libdir}
+    cp -r --no-preserve=ownership ${S}/Lib/* ${D}/${libdir}/${PYTHON_DIR}/
+    cp -r --no-preserve=ownership ${S}/Lib/site-packages/* ${D}/${bindir}/
 
-    install -d ${D}${bindir}
+    install -m 0644 ${S}/*.pyd ${D}/${bindir}/
     install -m 0644 ${S}/python.exe ${D}${bindir}
+    install -m 0644 ${S}/python.exe ${D}${bindir}/python3.exe
     install -m 0644 ${S}/python35.dll ${D}${bindir}
     install -m 0644 ${S}/python35.zip ${D}${bindir}
+    install -m 0644 ${S}/Scripts/* ${D}${bindir}
 }
diff --git a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
index 2ff4f761..78b9f8f9 100644
--- a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
@@ -34,9 +34,12 @@ COMPATIBLE_HOST = "i686.*-mingw.*"
 SRC_URI = "\
     https://download.qt.io/development_releases/prebuilt/python/Python35-win-x86.7z \
     https://www.python.org/ftp/python/${PV}/python-${PV}-embed-win32.zip;name=bin \
+    https://download.qt.io/development_releases/prebuilt/python/python-${PV}-modules-win32.zip;name=modules \
     "
 
 SRC_URI[md5sum] = "3da266445a4e6a93ff1949810141da8f"
 SRC_URI[sha256sum] = "b60c49227c6e920904d784681c16ee3591a18824c3abb89613813f93fde1c1f2"
 SRC_URI[bin.md5sum] = "ad637a1db7cf91e344318d55c94ad3ca"
 SRC_URI[bin.sha256sum] = "75f05800fbe4a8cd6672b268ca53244838684561e03c60c668a7dccb050eb954"
+SRC_URI[modules.md5sum] = "c44f01754f9975ae6d910783d69e6a28"
+SRC_URI[modules.sha256sum] = "13bbbcc724165407cfbec8d23424bd94f45541092f08523f0064f75e6c4de5ae"
diff --git a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
index 8e69fbd7..71b6c4b6 100644
--- a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
@@ -34,9 +34,12 @@ COMPATIBLE_HOST = "x86_64.*-mingw.*"
 SRC_URI = "\
     https://download.qt.io/development_releases/prebuilt/python/Python35-win-x64.7z \
     https://www.python.org/ftp/python/${PV}/python-${PV}-embed-amd64.zip;name=bin \
+    https://download.qt.io/development_releases/prebuilt/python/python-${PV}-modules-amd64.zip;name=modules \
     "
 
 SRC_URI[md5sum] = "08766b13bcbdcf8217a98bfc291d549f"
 SRC_URI[sha256sum] = "43e38c8a05dcbc2effd1915dbe2dc2be6e701ebf3eb00d6e45197ee773978124"
 SRC_URI[bin.md5sum] = "f1c24bb78bd6dd792a73d5ebfbd3b20e"
 SRC_URI[bin.sha256sum] = "faefbd98f61c0d87c5683eeb526ae4d4a9ddc369bef27870cfe1c8939329d066"
+SRC_URI[modules.md5sum] = "bf1deaf0a0b807bcd52e11d15892fec2"
+SRC_URI[modules.sha256sum] = "cd82789e05bf763b3b67f8e3ec78873c69ce922a13e391298be198702967d6da"
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/intel-corei7-64/kms-qsr.conf b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/intel-corei7-64/kms-qsr.conf
new file mode 100644
index 00000000..9d898b2f
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/intel-corei7-64/kms-qsr.conf
@@ -0,0 +1,10 @@
+{
+   "hwcursor": false,
+   "outputs": [
+    {
+      "name": "DP3",
+      "virtualIndex": 0,
+      "primary": true
+    }
+  ]
+}
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/kms-qsr.conf b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/kms-qsr.conf
new file mode 100644
index 00000000..f003a7fd
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/kms-qsr.conf
@@ -0,0 +1,3 @@
+{
+   "hwcursor": false
+}
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr
new file mode 100644
index 00000000..5544a53a
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr
@@ -0,0 +1,3 @@
+QT_QPA_EGLFS_KMS_CONFIG=/etc/kms-qsr.conf
+QSR_SHOW_TEXT_ON_STARTUP=1
+QSR_FILL_BLACK_BACKGROUND=1
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr.service b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr.service
index 340f4c02..78b26749 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr.service
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune-qsr.service
@@ -1,13 +1,14 @@
 [Unit]
-Description=Neptune
-After=dbus.service dbus-session.service systemd-user-sessions.service ivi-services.target
+Description=Neptune3-UI-QSR
+After=dbus-session.service systemd-user-sessions.service ivi-services.target
 Wants=ivi-services.target
+After=neptune.service
 Conflicts=neptune.service
 
 [Service]
 User=root
-ExecStart=/usr/bin/appcontroller /opt/neptune3/neptune3-ui-qsr-cluster
+ExecStart=/opt/neptune3/neptune3-ui-qsr-cluster
 Restart=on-failure
 WorkingDirectory=/opt/neptune3
-Environment=AM_STARTUP_TIMER=1
-Environment=QT_QPA_PLATFORM=linuxfb
+EnvironmentFile=/etc/default/qt
+EnvironmentFile=/etc/default/neptune-qsr
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
index c5aa8b66..e2822e74 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
@@ -1,16 +1,18 @@
 [Unit]
-Description=Neptune
+Description=Neptune3-UI
 After=dbus.service dbus-session@root.service systemd-user-sessions.service ivi-services.target
 Wants=ivi-services.target dbus-session@root.service
 Conflicts=neptune-qsr.service
+Before=neptune-qsr.service
+OnFailure=neptune-qsr.service
 
 [Service]
 User=root
 ExecStart=/opt/neptune3/neptune3-ui -r --dbus session -c am-config-neptune.yaml
-Restart=on-failure
 WorkingDirectory=/opt/neptune3
 EnvironmentFile=/etc/default/qt
 Environment=AM_STARTUP_TIMER=1
+Environment=QT_QPA_EGLFS_HIDECURSOR=1
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index de9c9d6f..2c101ed5 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -45,6 +45,8 @@ SRC_URI += " \
     file://neptune-qsr.service \
     file://drivedata-simulation-server.service \
     file://remotesettings-server.service \
+    file://kms-qsr.conf \
+    file://neptune-qsr \
     "
 SRC_URI_append_mx6 = " file://0001_hardware_variant_low.patch"
 SRC_URI_append_rpi = " file://0001_hardware_variant_low.patch"
@@ -87,6 +89,9 @@ do_install_append() {
 
     if ${@bb.utils.contains('PACKAGECONFIG','qtsaferenderer','true','false',d)}; then
         install -m 0644 ${WORKDIR}/neptune-qsr.service ${D}${systemd_unitdir}/system/
+        install -m 0755 -d ${D}${sysconfdir}/default
+        install -m 0644 ${WORKDIR}/kms-qsr.conf ${D}${sysconfdir}/
+        install -m 0644 ${WORKDIR}/neptune-qsr ${D}${sysconfdir}/default/
     fi
 
     # Don't install duplicate fonts, they are same as ttf-opensans
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 632525b9..9b9e0fce 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT_PROJECT = "qt-apps"
 
-SRCREV = "ee3277bf453502f0864e591740b1da785c4cc614"
+SRCREV = "b5b1f8797925ffd495603b9417a3c71099a1a55c"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index 0c4f1ce4..5a63911a 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -69,7 +69,6 @@ PACKAGECONFIG[remoteobjects-native] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects
 
 PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native remoteobjects-native"
 PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}"
-PACKAGECONFIG_class-nativesdk_mingw32 ??= "host-tools-only"
 
 ALLOW_EMPTY_${PN}-tools = "1"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch
new file mode 100644
index 00000000..f2427a56
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch
@@ -0,0 +1,33 @@
+From 6e3acb41295b93127b2b0e3da3068303406d7b13 Mon Sep 17 00:00:00 2001
+From: Teemu Holappa <teemu.holappa@qt.io>
+Date: Tue, 8 Oct 2019 14:43:22 +0300
+Subject: [PATCH] Fix libnetworkmsgplugin install
+
+Task-number: QSR-559
+Change-Id: I27438325bcdaac0bff9156cfdb183898a40210d1
+Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ src/messagesenderplugin/networkmsg/networkmsg.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/messagesenderplugin/networkmsg/networkmsg.pro b/src/messagesenderplugin/networkmsg/networkmsg.pro
+index 6094fb9..1925238 100644
+--- a/src/messagesenderplugin/networkmsg/networkmsg.pro
++++ b/src/messagesenderplugin/networkmsg/networkmsg.pro
+@@ -3,7 +3,9 @@ TARGET = $$qtLibraryTarget(networkmsgplugin)
+ TEMPLATE = lib
+ CONFIG += plugin
+ 
+-DESTDIR=$$[QT_INSTALL_PLUGINS]/$$replace(uri, \\., /)/saferenderer
++PLUGIN_TYPE = saferenderer
++target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE
++INSTALLS += target
+ 
+ # The following define makes your compiler emit warnings if you use
+ # any feature of Qt which has been marked as deprecated (the exact warnings
+@@ -27,5 +29,3 @@ HEADERS += \
+         $$PWD/../messagesenderinterface_p.h \
+         $$PWD/../../saferenderer/qsafeevent.h
+ DISTFILES += networkmsgplugin.json
+-
+-
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
index a012c957..499934bf 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
@@ -51,6 +51,7 @@ BRANCH = "1.1"
 SRC_URI = "\
     git://codereview.qt-project.org/tqtc-boot2qt/qtsaferenderer;branch=${BRANCH};protocol=ssh;sdk-uri=Src/QtSafeRenderer-1.1.1 \
     file://0001-Fix-yocto-build-issues.patch \
+    file://0002-Fix-libnetworkmsgplugin-install.patch \
     "
 SRCREV = "e31a035f69bbc7280fc6e01e0c1031ac569b84a7"