Merge remote-tracking branch 'origin/QtAS-5.12.0' into sumo

* origin/QtAS-5.12.0:

  b97117d automotive: update revisions
  4281e5b automotive: update revisions
  b344daf automotive: update neptune 3 revision
  a143fbc Use ABI flavor with QtCreator
  9ee5a7f QBSP: add correct cmake generator for windows toolchain
  8fcf3a1 meta-qt5: update revision
  0385367 Merge commit 'origin/sumo' into QtAS-5.12.0
  9a57170 automotive: update revisions

Conflicts:
  scripts/manifest.xml

Change-Id: I3064a526fd7861ea1aa0ec9b42c016c74dbc23eb

4 files changed, 7 insertions, 7 deletions

diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index da0f658..ee26f08 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -31,7 +31,7 @@
 DESCRIPTION = "Neptune 3 IVI UI"
 LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = "\
-    file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
@@ -45,7 +45,7 @@ SRC_URI += " \
     file://neptune.service \
     "
 
-SRCREV = "c80d9aba17b1b50618ae6311d48f35ec726a4007"
+SRCREV = "be372dec5a64cdfc2b2ba66ea240d9fa1cdbe3eb"
 
 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 52cfcff..a0b49f6 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -30,14 +30,14 @@
 DESCRIPTION = "QML Live target runtime"
 
 LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT_PROJECT = "qt-apps"
 
-SRCREV = "329a996f6a52494ef677107593a0146c71a2880a"
+SRCREV = "dc83ea3bcbcfece8a0c5caeafcdd9f0854ffae6f"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index c267e3f..7c81fc5 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -29,13 +29,13 @@
 
 DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "adb57812ee1cf89f3311f8a27ef97abf5d424bde"
+SRCREV = "9c4ff31161c2ea09c790ab143a23b3fe997ed4a3"
 
 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 4b122c2..cb3f6a3 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -51,7 +51,7 @@ SRC_URI += " \
     file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \
 "
 
-SRCREV_qtivi = "15a6672b304fe91a928911e810f5e83f233c790e"
+SRCREV_qtivi = "b18956edd578f49f369f7b3863881d0fadb035df"
 SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e"
 SRCREV = "${SRCREV_qtivi}"
 SRCREV_FORMAT = "qtivi_qface"