From 09f8c75cfeb0ea6d6b77dbd25cfbf779aa395b45 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 28 Feb 2017 11:10:51 +0200 Subject: 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 --- recipes-qt/automotive/neptune-ui_git.bb | 7 +---- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- .../tegra-t18x/appcontroller.conf | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 30 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 recipes-qt/qt5/qtwayland_git.bbappend 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 QT_GIT = "git://github.com/qtproject" QT_MODULE = "qt-apps-neptune-ui" -QT_MODULE_BRANCH = "master" SRC_URI += " \ file://neptune.service \ " -SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f" +SRCREV = "7d865406d6ccc538f9fd658a0d2b557e115d6919" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -do_configure_prepend() { - echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro -} - do_install_append() { install -m 0755 -d ${D}${systemd_unitdir}/system 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" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "74d8bb0c8590dec7d6106781b1aa460756425d8f" +SRCREV = "23a0e5a929b5b03f91ae532a765e2b7a543c3a99" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf index 64226cb..7236378 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf @@ -3,5 +3,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 env=QT_QUICK_CONTROLS_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp -env=QSG_RENDER_LOOP=windows +env=QSG_RENDER_LOOP=basic base=linux diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend new file mode 100644 index 0000000..7ef6ed9 --- /dev/null +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +SRCREV = "7d527c1914710a511c06713bbda1572b767cea34" -- cgit v1.2.3-54-g00ecf