Merge remote-tracking branch 'origin/thud' into warrior

* origin/warrior:
  88b68b qtsaferenderer: use latest revision
  d7ec9f3 Merge remote-tracking branch 'origin/sumo' into thud
  bc3ff11 neptune: use default env file
  0ffc48b dbus-session: refactor dbus session service
  312f894 Add recipe for default Qt environment variables
  c3d680b meta-qt5: update layer
  afafbcc meta-qt5: update layer
  a9b3902 QSR: fix qtsaferenderer build and update neptune
  7498a75 meta-qt5: update layer
  720637d Update automotive sha1s
  47b1e2d meta-qt5: update layer
  df96751 Whitelist path for Qt license
  e52858c Update automotive sha1s
  add2954 meta-qt5: update layer
  e6d9567 meta-qt5: update layer
  4bc0d59 Update automotive sha1s
  af511a9 boot2qt-demos: use qt5-git.inc
  306683b qtdeviceutilities: update to latest revision
  bdc2f36 Update automotive sha1s
  7170c0e qtquicktimeline: update to v1.0.0
  87db637 meta-qt5: update layer
  48aa9fd Merge remote-tracking branch 'origin/sumo' into thud
  3e5a8d7 qtivi: install systemd files only for target packages
  92f6f4d qtlocation: enable geoservices pkgconfigs
  8f4132e neptune3: don't install duplicate fonts
  ebcff25 neptune: apply low hw variant patch to all imx6 machines
  79f67cf boot2qt-demos: use qt5-git.inc
  c31e8f2 boot2qt-demos: bump version
  fa3e09f neptune: move neptune and ivi services to systemd
  4e50a6d meta-qt5: update layer
  9facaac qt5: update to Qt 5.12.5
  a01c0ad neptune: remove 3DStudio workaround
  23aab50 automotive: update revisions
  923995f Update automotive sha1s
  9eb2d2e qtdeviceutilities: Update to latest revision

Conflicts:
  scripts/manifest.xml

Change-Id: I7976c3c41668a37272debfe435d81f2fa48efeaf

2 files changed, 39 insertions, 1 deletions

diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb
index ff25ec51..464c1fb4 100644
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
 DEPENDS = "u-boot-mkimage-native"
 
 PV = "2.8b3"
diff --git a/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
new file mode 100644
index 00000000..b4aa97d9
--- /dev/null
+++ b/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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$
+##
+############################################################################
+
+do_configure_append() {
+    echo "FB_MULTI_BUFFER=2" >> ${WORKDIR}/defaults
+    echo "QT_QPA_EGLFS_FORCEVSYNC=1" >> ${WORKDIR}/defaults
+    echo "QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src" >> ${WORKDIR}/defaults
+}
+
+do_configure_append_mx8() {
+    echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults
+}