diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-02-28 11:10:51 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-02-28 10:30:37 +0000 |
commit | 09f8c75cfeb0ea6d6b77dbd25cfbf779aa395b45 (patch) | |
tree | 2aa293ff56c2e9d303b2d5fc277b0a963f5ad130 /recipes-qt/automotive | |
parent | 0605ccb7bab4c787c68a623717e0eef7ebd7d26d (diff) | |
download | meta-boot2qt-09f8c75cfeb0ea6d6b77dbd25cfbf779aa395b45.tar.gz |
Update automotive components
Use latest version of QtWayland from 5.8 branch, which is needed
for qtapplicationmanager to work correctly.
Change Drive CX to use basic rendering loop.
Change-Id: If74255e982a676f1c556f2ef25975b675a484e05
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'recipes-qt/automotive')
-rw-r--r-- | recipes-qt/automotive/neptune-ui_git.bb | 7 | ||||
-rw-r--r-- | recipes-qt/automotive/qtapplicationmanager_git.bb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 7397c11..11b81db 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb | |||
@@ -36,23 +36,18 @@ require recipes-qt/qt5/qt5-git.inc | |||
36 | 36 | ||
37 | QT_GIT = "git://github.com/qtproject" | 37 | QT_GIT = "git://github.com/qtproject" |
38 | QT_MODULE = "qt-apps-neptune-ui" | 38 | QT_MODULE = "qt-apps-neptune-ui" |
39 | QT_MODULE_BRANCH = "master" | ||
40 | 39 | ||
41 | SRC_URI += " \ | 40 | SRC_URI += " \ |
42 | file://neptune.service \ | 41 | file://neptune.service \ |
43 | " | 42 | " |
44 | 43 | ||
45 | SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f" | 44 | SRCREV = "7d865406d6ccc538f9fd658a0d2b557e115d6919" |
46 | 45 | ||
47 | DEPENDS = "qtbase qtdeclarative" | 46 | DEPENDS = "qtbase qtdeclarative" |
48 | RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ | 47 | RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ |
49 | qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ | 48 | qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ |
50 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | 49 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" |
51 | 50 | ||
52 | do_configure_prepend() { | ||
53 | echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro | ||
54 | } | ||
55 | |||
56 | do_install_append() { | 51 | do_install_append() { |
57 | install -m 0755 -d ${D}${systemd_unitdir}/system | 52 | install -m 0755 -d ${D}${systemd_unitdir}/system |
58 | install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ | 53 | install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ |
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index c4f1eb4..98d0042 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb | |||
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71" | |||
34 | inherit qt5-module | 34 | inherit qt5-module |
35 | require recipes-qt/qt5/qt5-git.inc | 35 | require recipes-qt/qt5/qt5-git.inc |
36 | 36 | ||
37 | SRCREV = "74d8bb0c8590dec7d6106781b1aa460756425d8f" | 37 | SRCREV = "23a0e5a929b5b03f91ae532a765e2b7a543c3a99" |
38 | 38 | ||
39 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ | 39 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ |
40 | ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" | 40 | ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" |