From 876c3484ba590fa1075fd58e89c0472b403c42d8 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 10 Dec 2018 17:01:58 +0200
Subject: automotive: update module revisions

Change-Id: Ife07f39c2809ac984e89aeb38919129d7fa6447f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service | 2 +-
 meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb          | 8 ++++----
 meta-boot2qt/recipes-qt/automotive/qmllive_git.bb              | 2 +-
 meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +-
 meta-boot2qt/recipes-qt/automotive/qtivi_git.bb                | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'meta-boot2qt')

diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
index 876509f..8139139 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
@@ -3,7 +3,7 @@ Description=Neptune
 After=dbus.service dbus-session.service systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/bin/appcontroller /opt/neptune3/neptune3-ui -r --dbus session -c am-config.yaml
+ExecStart=/usr/bin/appcontroller /opt/neptune3/neptune3-ui -r --dbus session -c am-config-neptune.yaml
 Restart=on-failure
 WorkingDirectory=/opt/neptune3
 Environment=AM_STARTUP_TIMER=1
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index 3ad29b1..da0f658 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -32,7 +32,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://imports/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
 inherit qt5-module systemd
@@ -45,7 +45,7 @@ SRC_URI += " \
     file://neptune.service \
     "
 
-SRCREV = "d8332c73ccda36e1da2661317d7ed3c787b17c68"
+SRCREV = "c80d9aba17b1b50618ae6311d48f35ec726a4007"
 
 QMAKE_PROFILES = "${S}/neptune3-ui.pro"
 
@@ -74,8 +74,8 @@ do_install_append() {
 
     # Move the fonts to the system-wide font location
     install -m 0755 -d ${D}${datadir}/fonts/ttf/
-    mv ${D}/opt/neptune3/imports/assets/fonts/*.ttf ${D}${datadir}/fonts/ttf/
-    rm -rf ${D}/opt/neptune3/imports/assets/fonts/
+    mv ${D}/opt/neptune3/imports_shared/assets/fonts/*.ttf ${D}${datadir}/fonts/ttf/
+    rm -rf ${D}/opt/neptune3/imports_shared/assets/fonts/
 
     # Don't package tests
     rm -rf ${D}/usr/share/tests
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index d87dd13..52cfcff 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 = "e400161c6ec932c180e8b9fe5e5d00a593ee254a"
+SRCREV = "329a996f6a52494ef677107593a0146c71a2880a"
 
 DEPENDS = "qtbase qtdeclarative"
 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index 89fcaa2..c267e3f 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -35,7 +35,7 @@ inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "941d493f47d1e15430ed062ea0aa4b1f7c087a04"
+SRCREV = "adb57812ee1cf89f3311f8a27ef97abf5d424bde"
 
 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 01a7d4b..4b122c2 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 = "142d7174863c2acf2792ba723c8dd273f8d07b22"
+SRCREV_qtivi = "15a6672b304fe91a928911e810f5e83f233c790e"
 SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e"
 SRCREV = "${SRCREV_qtivi}"
 SRCREV_FORMAT = "qtivi_qface"
-- 
cgit v1.2.3-54-g00ecf