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

* origin/thud:
  4530e45 meta-qt5: update layer
  73ea923 Merge remote-tracking branch 'origin/sumo' into thud
  a831374 deviceutilities: update & cleanup recipe
  528accf Drop wpa_supplicant related configs
  e3db9ef Fix for missing playback in 'Music' application
  b2db909 tegra: use default threaded render loop
  68a114b Update automotive sha1s for 5.13.1 in thud branch
  ac1c91c Update automotive sha1s for 5.13.1 in thud branch
  829f719 Merge remote-tracking branch 'origin/sumo' into thud
  2588551 QBSP: include readme file in the QBSP image package
  249a60a Update automotive sha1s for 5.13.1 in thud branch
  90fc04a Update automotive sha1s for 5.13.1 in thud branch

Notes:
* chenges from commit 2588551 QBSP: include readme file in the QBSP image package
  adjusted slightly due use of dynamic layers in warrior branch, eg. altered folder
  structure and nitrogen6x QBSP README relocation under boundary-layer

* Device Utilities SRCREV updated to match recipe update regarding wpa_supplicant
  removal.

  Changelog (trimmed):
  330b6f0 Drop wpa_supplicant from NetworkSettings
  ab2d016 Doc: Fix documentation warnings
  068e607 Bump version to 5.14.0
  5f3dce4 Add unit of measurement to the display size

Conflicts:
  meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
  meta-fsl-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
  meta-tegra-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
  scripts/manifest.xml

Change-Id: Ic6316477825c0ddad735081255dd755dae4a8762

20 files changed, 305 insertions, 29 deletions

diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend
index 7c5b7d68..64d9670e 100644
--- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend
@@ -27,6 +27,4 @@
 ##
 ############################################################################
 
-do_configure_append() {
-    echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults
-}
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README
new file mode 100644
index 00000000..70639d52
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README
@@ -0,0 +1,69 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In Boundary Devices i.MX6 Board target devices, see also the U-Boot and
+Nitrogen6_Lite device specific instructions:
+
+
+2. Installing QBSP on Host Platform
+
+After you have flashed the device with Flashing Wizard, you may need to update U-Boot:
+
+* If you are updating your Boundary Devices i.MX6 Board from an older image,
+update the U-Boot version on the device. See 2.1 Updating U-Boot.
+* If your target device is Nitrogen6_Lite Device, see 1.2 Setup for Nitrogen6_Lite Device.
+
+Note: Sometimes U-Boot fails to select a suitable display for your target device
+and sets an incorrect display resolution.
+https://doc.qt.io/QtForDeviceCreation/qtee-customization.html#configuring-display-resolution
+instructs how you can configure the display and resolution used in your target device.
+
+
+2.1 Updating U-Boot
+
+If you are updating from an older image, you may also need to update the version
+of U-Boot on the device.
+
+The prebuilt image already contains U-Boot versions for most of the device variants
+from Boundary Devices, but the update needs to be done manually when first starting
+the device. Correct device type is selected by setting the uboot_defconfig
+U-Boot environment variable.
+
+More information available from https://boundarydevices.com/compiling-latest-u-boot-for-i-mx6-2015-edition/.
+
+Access the device's console and run the following commands on the U-Boot prompt:
+
+setenv uboot_defconfig <device type>
+setenv devnum 1 # or 0, if using SD slot
+setenv devtype mmc
+run upgradeu
+
+Reset or power cycle the device to start the new U-Boot. To reset the U-Boot
+environment to new default values, enter the following commands in the U-Boot
+command line:
+
+env default -a
+saveenv
+
+
+2.2 Setup for Nitrogen6_Lite Device
+
+The boot script requires the environment variables, dtbname and gpumem, to identify
+the device as Nitrogen6_Lite. Otherwise, the device is booted with the default
+GPU memory setting of 512MiB, which is more than what is available on the
+Nitrogen_Lite devices (128MibB).
+
+Use one of the two following options to enable the scripts boot the device with
+correct GPU memory setting:
+
+* Write a uEnv.txt file on to the boot partition of SD card with the following content:
+
+gpumem=67108864
+dtbname=imx6dl-nit6xlite.dtb
+
+* Access the device's console and run the following commands on the U-Boot prompt:
+
+U-Boot > setenv gpumem 67108864
+U-Boot > setenv dtbname imx6dl-nit6xlite.dtb
+U-Boot > saveenv
+
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/imx7s-warp/README b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/imx7s-warp/README
new file mode 100644
index 00000000..ee4f7bab
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/imx7s-warp/README
@@ -0,0 +1,21 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In 2. Installing Boot to Qt on Target Device, see also the WaRP7 specific instructions:
+
+
+2. Installing Boot to Qt on Target Device
+
+Follow the steps in this documentation to flash your WaRP7 with an image containing
+the Boot to Qt stack:
+
+1.Use the USB cable to access the serial terminal on WaRP7.
+2. Power on your WaRP7 device and press any key to stop the autoboot.
+3. Run the following command in U-Boot:
+
+ ums 0 mmc 0
+
+4. Use Flashing Wizard to flash the image to the device:
+   4.1 Launch Qt Creator.
+   4.2 Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard.
+5. Press Ctrl+C in the U-Boot console and run the reset command.
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
new file mode 100644
index 00000000..64d9670e
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
new file mode 100644
index 00000000..64d9670e
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
new file mode 100644
index 00000000..2095db24
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
@@ -0,0 +1,4 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In 3. Configuring a Device Kit in Qt Creator, you should note that Raspberry Pi does not support USB OTG.
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
new file mode 100644
index 00000000..64d9670e
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
new file mode 100644
index 00000000..f91fd080
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
@@ -0,0 +1,66 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions:
+
+
+2. Installing Boot to Qt on Target Device
+
+To flash the image, you can use either Toradex Easy Installer
+(https://developer.toradex.com/software/toradex-easy-installer#) or Qt's Flashing Wizard.
+With Toradex Easy Installer, the image is flashed to the device's internal eMMC
+flash memory.
+
+
+2.1 Flashing with Toradex Easy Installer:
+
+When Toradex Easy Installer is connected to the Internet, it automatically provides
+the latest Boot to Qt image in its image list but that is not necessarily compatible
+with your Boot to Qt installation. When you flash with Toradex Easy Installer,
+you should always use the *.tezi.tar package that is included into the Boot to Qt
+installation.
+
+Flash the Boot to Qt image with Toradex Easy Installer as follows:
+
+1. If your target device does not have the pre-installed Toradex Easy Installer,
+follow instructions in https://developer.toradex.com/software/toradex-easy-installer#load-toradex-easy-installer#
+to load Toradex Easy Installer.
+2. Your Boot to Qt installation has the *.tezi.tar package under
+<Qt installation directory>/<Qt version>/Boot2Qt/<target>/images. Extract the package
+to an SD card or a USB flash drive.
+3. Flash the image from the SD card or the USB flash drive with Toradex Easy Installer.
+See https://developer.toradex.com/software/toradex-easy-installer#installing-the-images.
+
+
+2.2 Flashing with Qt's Flashing Wizard
+
+Use Flashing Wizard to flash the image to your device:
+
+1. Connect your SD card reader to the development host. Make sure that the SD card size is at least 4 GB.
+2. Launch Qt Creator.
+3. Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard.
+
+In order to boot from the external SD card, U-Boot needs to be updated.
+
+
+2.3 Booting from External SD Card
+
+Connect a serial cable to the device and enter into the U-Boot environment by
+pressing any key before the autoboot.
+
+Enter following commands into U-Boot:
+
+run setupdate
+run update
+
+Reset or power cycle the device to start the new U-Boot.
+To reset the U-Boot environment to new default values, enter the following commands in the U-Boot command line:
+
+env default -a
+saveenv
+
+New U-Boot commands are now stored into the device.
+
+For more information about the boot process on the Toradex Colibri devices,
+see https://developer.toradex.com/knowledge-base/linux-booting.
+
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README
new file mode 100644
index 00000000..d51a4847
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README
@@ -0,0 +1,25 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions.
+
+
+2. Installing Boot to Qt on Target Device
+
+Use Flashing Wizard to flash the image to your Toradex board:
+
+1. Use the RS-232 cable to access the serial terminal on Toradex board.
+2. Power on your device and press any key to stop the autoboot.
+3. Run the following command in U-Boot:
+
+ums 0 mmc 0
+
+4. Use Flashing Wizard to flash the image to the device:
+   4.1 Launch Qt Creator.
+   4.2 Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard.
+5. Press Ctrl+C in the U-Boot console and run the reset command.
+
+For more information about flashing the Toradex devices,
+see https://developer.toradex.com/software/linux/linux-software/build-apalis-imx8-yoctoopenembedded-bring-up-image#emmc-boot#.
+
+Note: The Boot to Qt software stack supports only the v1.0B silicon.
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 01327dcd..a464a22f 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index 363b56f6..afce4fe8 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -31,6 +31,8 @@ inherit meta nopackages abi-arch siteinfo
 
 FILESEXTRAPATHS_prepend := "${BOOT2QTBASE}/files/qbsp:"
 
+QBSP_README ?= "README"
+
 SRC_URI = "\
     file://base_package.xml \
     file://base_installscript.qs \
@@ -47,6 +49,7 @@ do_qbsp[depends] += "\
     installer-framework-native:do_populate_sysroot \
     ${QBSP_SDK_TASK}:do_populate_sdk \
     ${QBSP_IMAGE_TASK}:do_image_complete \
+    qbsp-readme:do_deploy \
     "
 
 QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
@@ -129,6 +132,10 @@ prepare_qbsp() {
     mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
     7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
 
+    if [ -n "${QBSP_README}" ]; then
+        cp ${DEPLOY_DIR_IMAGE}/${QBSP_README} ${B}/images/${QBSP_INSTALL_PATH}/images/
+    fi
+
     cd ${B}/images
     7za a ${COMPONENT_PATH}/data/image.7z *
 
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index 15d06373..aec372ee 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -49,7 +49,7 @@ SRC_URI += " \
 SRC_URI_append_mx6 = " file://0001_hardware_variant_low.patch"
 SRC_URI_append_rpi = " file://0001_hardware_variant_low.patch"
 
-SRCREV = "cbbfd19ba50ac65d33b72f3d47dfaa1aca74cccd"
+SRCREV = "d375b489e37e19c56c2826c16c0d4ef410d86450"
 
 QMAKE_PROFILES = "${S}/neptune3-ui.pro"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index 7fcc7c6e..91245dc0 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "ea7811529421975182f3de519da36ea610844eb9"
+SRCREV = "5f05117fb8c31ad58937d6b5bd55139a697c2673"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi/ivimedia-simulation-server.service b/meta-boot2qt/recipes-qt/automotive/qtivi/ivimedia-simulation-server.service
index abd5528d..9b405327 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi/ivimedia-simulation-server.service
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/ivimedia-simulation-server.service
@@ -7,6 +7,7 @@ Before=ivi-services.target
 User=root
 ExecStart=/usr/bin/ivimedia-simulation-server
 Restart=on-failure
+Environment=SERVER_CONF_PATH=/opt/neptune3/server.conf
 
 [Install]
 WantedBy=ivi-services.target
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi/ivivehiclefunctions-simulation-server.service b/meta-boot2qt/recipes-qt/automotive/qtivi/ivivehiclefunctions-simulation-server.service
index e228d029..2cf2d2df 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi/ivivehiclefunctions-simulation-server.service
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/ivivehiclefunctions-simulation-server.service
@@ -7,6 +7,7 @@ Before=ivi-services.target
 User=root
 ExecStart=/usr/bin/ivivehiclefunctions-simulation-server
 Restart=on-failure
+Environment=SERVER_CONF_PATH=/opt/neptune3/server.conf
 
 [Install]
 WantedBy=ivi-services.target
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index a0fdb29d..03532424 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -54,7 +54,7 @@ SRC_URI += " \
     file://ivi-services.target \
 "
 
-SRCREV = "51d1472eb3e605c9da7030be1f7ef5ae36975aa6"
+SRCREV = "a75c835d3eda43961faeefc370c59992f3d3268a"
 
 PACKAGECONFIG ?= "taglib ivigenerator remoteobjects"
 PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
index f10d37c5..a012c957 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
@@ -52,7 +52,7 @@ 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 \
     "
-SRCREV = "3596699dc8927f1112b6a7974fc80d68ab1fd0f6"
+SRCREV = "e31a035f69bbc7280fc6e01e0c1031ac569b84a7"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb
index e8808977..197c5ff6 100644
--- a/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,21 +27,18 @@
 ##
 ############################################################################
 
-do_install_append () {
-    install -d ${D}${includedir}/wpa-supplicant
+SUMMARY = "Device specific installation instructions for the QBSP"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
 
-    install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/
+inherit deploy nopackages
 
-    install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/
-    install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/
-}
+SRC_URI = "file://README"
+QBSP_README ?= "README"
 
-FILES_${PN}-dev += "${includedir}/wpa-supplicant/*"
+do_deploy() {
+    install -d ${DEPLOYDIR}
+    install -m 0644 ${WORKDIR}/${QBSP_README} ${DEPLOYDIR}
+}
 
+addtask do_deploy after do_compile before do_build
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme/README b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme/README
new file mode 100644
index 00000000..fb7d63c1
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme/README
@@ -0,0 +1,2 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index eb3a34e3..c5d4ebc8 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -34,12 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
-
-EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-
-SRCREV = "eda53febdee5bbeddd2c59bd4a107fbd92b38356"
+SRCREV = "f9a7453281699078d45ce7a06835898b7e2cf5c5"
 
 DEPENDS = "\
     qtbase qtdeclarative qtconnectivity qtdeclarative-native \