From 09ffc8e6981fe58c28d6d105859ac0a078045a9b Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 18 Oct 2017 16:04:43 +0200 Subject: Update neptune-ui to the latest version This version is now based on qtquickcontrols2 and also provides it's own binary. Change-Id: Ia3db1f12aaf396d341758fd0fa24d4e9ec6c93a2 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui/neptune.service | 2 +- recipes-qt/automotive/neptune-ui_git.bb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index 7793d0b..f27ac10 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service @@ -3,7 +3,7 @@ Description=Neptune After=dbus.service dbus-session.service systemd-user-sessions.service [Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Restart=on-failure WorkingDirectory=/opt/neptune diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index b7ca95d..f13bbfb 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Neptune IVI UI" LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82" inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc @@ -41,10 +41,10 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "6ddea70fd06d78ca7672f18221b91b3e8990aee8" +SRCREV = "2cf65ed117e8e4494b1ab66b35e3dc9a70234659" -DEPENDS = "qtbase qtdeclarative qttools-native" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ +DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" +RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -- cgit v1.2.3-54-g00ecf