Merge remote-tracking branch 'origin/pyro' into sumo

* origin/pyro: (29 commits)
  meta-qt5: update layer
  qt5: Enable Link Time Optimization
  toradex: add Qt marketing slides
  toradex: add support for colibri-imx6ull
  rpi: include mcp2515 overlay for CAN support
  qtdeviceutilities: update to latest version
  boot2qt-demos: update revision
  boot2qt-addons: update components
  meta-qt5: update layer
  boot2qt-launcher: update to latest version
  qtdeviceutilities: update to latest version
  Do not use Link Time Optimization
  boot2qt-demo: update demo videos
  qtquicktimeline: fetch from public repository
  boot2qt-demos: no need to patch demos anymore
  Don't use git folder to check if we are using SDK sources
  toradex: include easy installer file in the release 7z
  toradex: Add Boot2Qt material to the Tezi image
  meta-qt5: update layer
  qt5: update submodules
  ...

Change-Id: I23e9b0a018328d7be1441616c07c526e2db61be2

31 files changed, 73 insertions, 176 deletions

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
deleted file mode 100644
index 47260a4..0000000
--- a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
+++ /dev/null
@@ -1,53 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
-
-BBLAYERS ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-freescale \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
-  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
-  "
diff --git a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
deleted file mode 100644
index 4ec3e4d..0000000
--- a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
-
-DISTRO_FEATURES_remove = "webengine"
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index bdb57d8..0d3fd29 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
 IMAGE_FSTYPES += "teziimg"
 
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
+
 BOOT_SCRIPTS += " \
     u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
     SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
deleted file mode 100644
index 099be56..0000000
--- a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "BeagleBone Black"
-
-DISTRO_FEATURES_remove = "webengine"
-
-BOOT_SPACE = "33792"
diff --git a/meta-boot2qt-distro/conf/distro/include/ci.inc b/meta-boot2qt-distro/conf/distro/include/ci.inc
index f6e3fd7..f213281 100644
--- a/meta-boot2qt-distro/conf/distro/include/ci.inc
+++ b/meta-boot2qt-distro/conf/distro/include/ci.inc
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-MACHINE_EXTRA_INSTALL += "libnss-mdns"
+MACHINE_EXTRA_INSTALL_SDK += "libnss-mdns"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 814676b..f1bf7d8 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 
 IMAGE_FSTYPES += "teziimg"
 
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
+
 BOOT_SCRIPTS += " \
     u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
     SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/meta-boot2qt-distro/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 80f90f2..9090055 100644
--- a/meta-boot2qt-distro/conf/distro/include/ti.inc
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,17 +27,24 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl.inc
+include conf/distro/include/toradex.inc
 
-UBOOT_SUFFIX = "img"
-BOOT_SCRIPTS += "\
-    MLO-${MACHINE}:MLO \
-    u-boot-${MACHINE}.img:u-boot.img \
+DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
+
+IMAGE_FSTYPES += "teziimg"
+
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
     "
 
-EXTRA_IMAGEDEPENDS += "u-boot"
+BOOT_SCRIPTS += " \
+    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+    "
+
+PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
+
+DISTRO_FEATURES_remove = "webengine wayland"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"
+# try to limit the maximum size of the tezi image
+RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 4e0daa7..a5695f7 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 
 IMAGE_FSTYPES += "teziimg"
 
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
+
 BOOT_SCRIPTS += " \
     u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index 8c86d1a..1d2cf9d 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -52,3 +52,8 @@ BBMASK += "\
     "
 
 MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
+
+KERNEL_DEVICETREE += "\
+    overlays/mcp2515-can0.dtbo \
+    overlays/mcp2515-can1.dtbo \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 83b6d45..85d9455 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -46,3 +46,7 @@ BOOT_SCRIPTS += " \
     fwd_mmc.img:flash_mmc.img \
     ${MACHINE}:${MACHINEDIR} \
     "
+
+# fix: basehash value changed from ... to ....
+# The metadata is not deterministic and this needs to be fixed.
+rootfs_tezi_json[vardepsexclude] = "DATE"
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9f43fff..21552d7 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK"
 PR = "r0"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 
 inherit nativesdk packagegroup
 
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
index b6573e2..3dbda88 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Packagegroup for B2Qt embedded Linux image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
index b1bec0e..39e492a 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
index af291c7..29914a7 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
index 4a5fa39..7dd1604 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
index d0bdb16..b9c5fd0 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -28,8 +28,8 @@
 ############################################################################
 
 DESCRIPTION = "B2Qt Automotive Qt5 image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 DEPLOY_CONF_TYPE = "Qt Automotive Suite $QT_VERSION"
 
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
index 32773e1..1afeb7e 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "B2Qt on embedded Linux SDK image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 IMAGE_FEATURES += "\
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
index fa93851..3ccfa09 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -27,10 +27,9 @@
 ##
 ############################################################################
 
-DESCRIPTION = "B2Qt embedded Qt5 image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-PR = "r0"
+SUMMARY = "Qt for Device Creation Demo Image"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION"
 
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 5595cc6..73a5078 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -29,8 +29,8 @@
 
 DESCRIPTION = "Meta task for QBSP creation"
 
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 # get Qt version number
 require recipes-qt/qt5/qt5-git.inc
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index dc2873f..1d64011 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -29,8 +29,8 @@
 
 DESCRIPTION = "Meta task for QBSP creation"
 
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 # get Qt version number
 require recipes-qt/qt5/qt5-git.inc
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
index 94bf48d..11ce786 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -29,8 +29,8 @@
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 inherit populate_b2qt_qt5_sdk
 
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 65354ad..6841cdb 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -29,8 +29,8 @@
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
 inherit populate_b2qt_qt5_sdk
 
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
index 7ce53c6..8c4adaa 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit nativesdk packagegroup
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index 10607e3..9f2d197 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit nativesdk packagegroup
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 9fe3827..078763a 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Automotive specific Qt packages"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 
 inherit packagegroup
 
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
index 6ae1ef4..3b64622 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 345fbaa..2e46a32 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Device Creation specific Qt packages"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 
 inherit packagegroup
 
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index fa21738..c1d7f26 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 PR = "r0"
 
 inherit packagegroup
@@ -62,6 +62,7 @@ RDEPENDS_${PN} += " \
     qtotaupdate-dev \
     qtquickcontrols-dev \
     qtquickcontrols2-dev \
+    qtquicktimeline-dev \
     qtremoteobjects-dev \
     qtscxml-dev \
     qtsensors-dev \
@@ -77,7 +78,3 @@ RDEPENDS_${PN} += " \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
     "
-
-RDEPENDS_${PN} += "\
-    ${@ "qtquicktimeline-dev" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \
-    "
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 89121a1..38bddaa 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Qt5 modules"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 
 inherit packagegroup
 
@@ -54,6 +54,7 @@ RDEPENDS_${PN} += " \
     qtotaupdate \
     qtquickcontrols \
     qtquickcontrols2 \
+    qtquicktimeline \
     qtremoteobjects \
     qtscxml \
     qtsensors \
@@ -79,7 +80,3 @@ RDEPENDS_${PN} += " \
     qtxmlpatterns \
     qtvirtualkeyboard \
     "
-
-RDEPENDS_${PN} += "\
-    ${@ "qtquicktimeline" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \
-    "
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri
new file mode 100644
index 0000000..9c4f92f
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri
@@ -0,0 +1,2 @@
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = linuxfb
diff --git a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/recipes-qt/qt5/qtwebengine_git.bbappend
index d9b92f0..cfd3a39 100644
--- a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,8 +27,5 @@
 ##
 ############################################################################
 
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "BeagleBoard"
-
-DISTRO_FEATURES_remove = "webengine opengl"
+# QTBUG-70348
+EXTRA_QMAKEVARS_PRE_append_arm = " CONFIG-=ltcg"