Merge remote-tracking branch 'origin/5.14.1_QtAS' into warrior

Change-Id: Ia2eca74a7012d0d08ca7545e15ac1a3502b3f045

8 files changed, 34 insertions, 14 deletions

diff --git a/meta-boot2qt/recipes-devtools/python/python3-watchdog_0.8.5.bb b/meta-boot2qt/recipes-devtools/python/python3-watchdog_0.9.0.bb
index bd04ad71..94628a19 100644
--- a/meta-boot2qt/recipes-devtools/python/python3-watchdog_0.8.5.bb
+++ b/meta-boot2qt/recipes-devtools/python/python3-watchdog_0.9.0.bb
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-PYPI_PACKAGE = "watchdog3"
+PYPI_PACKAGE = "watchdog"
 DEPS = "python3-pathtools"
 DEPENDS = "${DEPS}"
 RDEPENDS_${PN} = "${DEPS}"
@@ -35,7 +35,7 @@ inherit pypi setuptools3
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[md5sum] = "3e13f11f432fec5eb0198d9b1d2a55ab"
-SRC_URI[sha256sum] = "742b1b8836807bca7e28b062b85987ae5fc10aada4274c204b26a195a7ddf2b3"
+SRC_URI[md5sum] = "7cdc103f607e72fc32c206301a72d1b2"
+SRC_URI[sha256sum] = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"
 
 BBCLASSEXTEND = "nativesdk native"
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index cfd105c0..045182c5 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -53,7 +53,7 @@ SRC_URI += " \
 SRC_URI_append_mx6 = " file://0001_hardware_variant_low.patch"
 SRC_URI_append_rpi = " file://0001_hardware_variant_low.patch"
 
-SRCREV = "4593763d068fbde6f8f82d718fa9ecdcc7056680"
+SRCREV = "9cbd67e3f7781286dd6493c467ed0f8777472aae"
 
 QMAKE_PROFILES = "${S}/neptune3-ui.pro"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 8099ced6..17a54a29 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 = "6b71d03501bd933eebc4ea4390711893ef82364c"
+SRCREV = "b1cc7a739d1f3cf20762725b36b10ebb06564acb"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index 6c0f7a52..71d7ceef 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 = "a29a60774a74e13d5803e1c9109bc88823dfaa25"
+SRCREV = "3276c4feae52ed033be2c2b7b1e15ba3d2dcb470"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index 34b4bf84..856f6a06 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 = "89d3ea0c02f64173d47a7d1def16de22c3361158"
+SRCREV = "9a1d79ac5cc2abf4eccacf0a50143e127e444a77"
 
 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/0001-Fix-yocto-build-issues.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
index 88e5e79b..e4a75cad 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
@@ -1,4 +1,4 @@
-From b6c8b88c62feabd1258744a956aa67fa829a6e72 Mon Sep 17 00:00:00 2001
+From d4d20f0d0c3592bdc736513bc594f6d0fa0f6a15 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 30 May 2019 09:54:57 +0300
 Subject: [PATCH] Fix yocto build issues
@@ -8,13 +8,15 @@ Subject: [PATCH] Fix yocto build issues
   directory in the nativesdk, which has target paths for QT_INSTALL_PLUGINS
   that causes qtsafelayouttool to fail to find any plugins.
 
+- Use QT_HOST_BINS/get to point to the native sysroot
+
 Change-Id: Ie042b7ef45c7a5e03b36008a2e2cbce1a9193139
 ---
- tools/featurespec/qtsaferenderer-tools.prf | 4 ++++
- 1 file changed, 4 insertions(+)
+ tools/featurespec/qtsaferenderer-tools.prf | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/tools/featurespec/qtsaferenderer-tools.prf b/tools/featurespec/qtsaferenderer-tools.prf
-index b4daf86..36440e2 100644
+index b4daf86..773c8e5 100644
 --- a/tools/featurespec/qtsaferenderer-tools.prf
 +++ b/tools/featurespec/qtsaferenderer-tools.prf
 @@ -1,3 +1,7 @@
@@ -25,3 +27,21 @@ index b4daf86..36440e2 100644
  defineTest(addSafeTargetEnv) {
      cmd = $$3
      $${1}_EXE = $$cmd
+@@ -17,7 +21,7 @@ defineTest(addSafeTargetEnv) {
+ defineTest(prepareSafeTool) {
+     cmd = $$eval(QT_TOOL.$${2}.binary)
+     isEmpty(cmd)|!exists($$cmd) {
+-        cmd = $$[QT_HOST_BINS]/$${2}
++        cmd = $$[QT_HOST_BINS/get]/$${2}
+         contains(QMAKE_HOST.os, Windows) {
+             cmd = $${cmd}.exe
+         }
+@@ -44,7 +48,7 @@ prepareSafeTool(QMAKE_SAFELAYOUT, qtsafelayouttool)
+     prepareSafeTool(QMAKE_SAFERCC, qtsafercctool)
+     SAFERCC_FILE = $$QMAKE_SAFERCC_EXE
+     isEmpty(SAFERCC_FILE)|!exists($$SAFERCC_FILE) {
+-        cmd = $$absolute_path("rcc", $$[QT_HOST_BINS])
++        cmd = $$absolute_path("rcc", $$[QT_HOST_BINS/get])
+         contains(QMAKE_HOST.os, Windows) {
+             cmd = $$system_path($${cmd}.exe)
+         }
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
index d507446a..fa4001f0 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.2 \
     file://0001-Fix-yocto-build-issues.patch \
     "
-SRCREV = "5b0a004c3c985c507ae713e239d8d7b13f495531"
+SRCREV = "ac0349c1f5d5486e1f8ecaf1db2e1221ff9f0837"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt/recipes-qt/qt5/qface_git.bb b/meta-boot2qt/recipes-qt/qt5/qface_git.bb
index 637db611..fe25d5a9 100644
--- a/meta-boot2qt/recipes-qt/qt5/qface_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qface_git.bb
@@ -46,8 +46,8 @@ RDEPENDS_${PN} += "${DEPS}"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"
 SRC_URI = "git://code.qt.io/qt/qtivi-qface.git;protocol=https;nobranch=1"
-SRCREV = "ca2868a450c4090d5460827a896648280bb72eb0"
-PV = "2.0"
+SRCREV = "fbf55d919222a5c90f037842958f055ed3bd1eb3"
+PV = "2.0.3"
 S = "${WORKDIR}/git"
 CLEANBROKEN = "1"