summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-10-18 16:04:43 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2017-10-19 09:51:20 +0000
commit09ffc8e6981fe58c28d6d105859ac0a078045a9b (patch)
tree4d7b4a3444371144e46e10e9482cd1f600a46e2b
parent3c442f01d1b3d964658489fd085d01e9abcefe96 (diff)
downloadmeta-boot2qt-09ffc8e6981fe58c28d6d105859ac0a078045a9b.tar.gz
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 <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/automotive/neptune-ui/neptune.service2
-rw-r--r--recipes-qt/automotive/neptune-ui_git.bb8
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
3After=dbus.service dbus-session.service systemd-user-sessions.service 3After=dbus.service dbus-session.service systemd-user-sessions.service
4 4
5[Service] 5[Service]
6ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml 6ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml
7Restart=on-failure 7Restart=on-failure
8WorkingDirectory=/opt/neptune 8WorkingDirectory=/opt/neptune
9 9
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 @@
29 29
30DESCRIPTION = "Neptune IVI UI" 30DESCRIPTION = "Neptune IVI UI"
31LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" 31LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
32LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c" 32LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82"
33 33
34inherit qt5-module systemd 34inherit qt5-module systemd
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
@@ -41,10 +41,10 @@ SRC_URI += " \
41 file://neptune.service \ 41 file://neptune.service \
42 " 42 "
43 43
44SRCREV = "6ddea70fd06d78ca7672f18221b91b3e8990aee8" 44SRCREV = "2cf65ed117e8e4494b1ab66b35e3dc9a70234659"
45 45
46DEPENDS = "qtbase qtdeclarative qttools-native" 46DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager"
47RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ 47RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \
48 qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ 48 qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" 49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
50 50