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

19 files changed, 55 insertions, 73 deletions

diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index 5b8c687..54539e2 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -29,7 +29,7 @@
 ############################################################################
 
 DESCRIPTION = "Neptune 3 IVI UI"
-LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-DCLA-2.1 )"
+LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = "\
     file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \
     file://imports/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 8561c01..d87dd13 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "QML Live target runtime"
 
-LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
 
 inherit qmake5
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index d5ba176..87ce644 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Qt component for application lifecycle management"
-LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
+LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717"
 
 inherit qt5-module
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index fa2e1c3..164edeb 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Qt IVI"
-LICENSE = "(GFDL-1.3 & BSD & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
+LICENSE = "(GFDL-1.3 & BSD & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
                     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf
new file mode 100644
index 0000000..38d06e6
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf
@@ -0,0 +1,9 @@
+env=QMLSCENE_DEVICE=softwarecontext
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_QPA_PLATFORM=linuxfb
+env=QSG_RENDER_LOOP=basic
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QUICK_CONTROLS_1_STYLE=Flat
+env=XDG_RUNTIME_DIR=/run/user/0
+env=QTWEBENGINE_DISABLE_SANDBOX=1
+base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf
new file mode 100644
index 0000000..ce89f0a
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf
@@ -0,0 +1,8 @@
+env=FB_MULTI_BUFFER=2
+env=QT_QPA_EGLFS_FORCE888=1
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QUICK_CONTROLS_1_STYLE=Flat
+env=XDG_RUNTIME_DIR=/run/user/0
+env=QTWEBENGINE_DISABLE_SANDBOX=1
+base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
index d1f8722..b921c23 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Boot to Qt Appcontroller"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
 
 inherit qmake5
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index c63de9a..3900abb 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Boot to Qt Demos"
-LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
+LICENSE = "BSD | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5
@@ -37,21 +37,23 @@ QT_GIT_PROJECT=""
 
 SRC_URI = " \
     ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \
-    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
-    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
+    https://qt-files.s3.amazonaws.com/examples/Videos/Qt+for+Designers+and+Developers.mp4;name=video1 \
+    https://qt-files.s3.amazonaws.com/examples/Videos/Qt+for+Device+Creation.mp4;name=video2 \
+    https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
     "
 
-PV = "5.11.1+git${SRCPV}"
+PV = "5.11.2+git${SRCPV}"
 
 BRANCH = "5.11"
-BROWSER_BRANCH = "dev"
 
-SRCREV = "a60eb6782491ca42dd9139ad0a14866cdf064d40"
+SRCREV = "ca03367f33d6430d3ddbbd70edf832bced59ff74"
 
-SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b"
-SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89"
-SRC_URI[video2.md5sum] = "e03422de1dba27189872e7d579e7da1b"
-SRC_URI[video2.sha256sum] = "651e0b4d2b3272dc10bfc9edba4f0c1a7084cd087c75e8a098f7ba3454c7e485"
+SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
+SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
+SRC_URI[video2.md5sum] = "828f4babda370b5d73688ff833e95583"
+SRC_URI[video2.sha256sum] = "eba7d3322e63ce47c3433e920f423febfc3533ab05d13ca2f09a4af7d8c6bc44"
+SRC_URI[video3.md5sum] = "00966663950a8e7ddcfd6def2a87d57a"
+SRC_URI[video3.sha256sum] = "b20ba98464e85cb979f1c505387b0407c4fbec2eaa2170d1360a77ec4c1c2700"
 
 S = "${WORKDIR}/git/basicsuite"
 
@@ -86,23 +88,7 @@ do_install_append() {
     rm -rf ${D}/data/user/qt/qtwebbrowser/qmldir
 
     install -d -m 0755 ${D}/data/videos
-    install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos
-    install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos
-
-    # Common settings
-    cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/enterprise-charts/
-    cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/graphicaleffects/
-    cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/mediaplayer/
-
-    # Image paths
-    sed -i 's#arrow.png#images/arrow.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
-    sed -i 's#qt-logo.png#images/qt-logo.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
-    sed -i 's#back.png#icons/gallery/20x20/back.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
-    sed -i 's#drawer.png#icons/gallery/20x20/drawer.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
-    sed -i 's#menu.png#icons/gallery/20x20/menu.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
-
-    # Page references (source: "SomePage.qml" -> source: "pages/SomePage.qml")
-    sed -i 's#source: \"\(.*\)Page.qml#source: \"pages/\1Page.qml#' ${D}/data/user/qt/qtquickcontrols2/main.qml
+    install -m 0644 ${WORKDIR}/*.mp4 ${D}/data/videos
 }
 
 FILES_${PN} += " \
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
deleted file mode 100644
index cdf6480..0000000
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=B2Qt user application
-BindsTo=dev-fb0.device
-After=dev-fb0.device
-ConditionPathExists=/usr/bin/b2qt
-
-[Service]
-ExecStart=-/usr/bin/appcontroller /usr/bin/b2qt
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
deleted file mode 100644
index 1094675..0000000
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=B2Qt Launcher Demo
-BindsTo=dev-fb0.device
-After=dev-fb0.device
-ConditionPathExists=!/usr/bin/b2qt
-
-[Service]
-ExecStart=-/usr/bin/appcontroller /usr/bin/qtlauncher --applications-root /data/user/qt
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index aa597e8..cda1ac7 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Boot to Qt Demo Launcher"
-LICENSE = "(BSD & GPL-3.0) | The-Qt-Company-DCLA-2.1"
+LICENSE = "(BSD & GPL-3.0) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5
@@ -43,7 +43,7 @@ SRC_URI += " \
     file://ebikedata.service \
     "
 
-SRCREV = "56d6c566fc434c159d573eba07a4397e5aea3638"
+SRCREV = "ce4d3833f5193168fb61392d08f61e73997632eb"
 
 DEPENDS = "\
     qtbase qtdeclarative qtquickcontrols2 \
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
index 3d9a196..cc05383 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Boot to Qt Wayland Demo Compositor"
-LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
+LICENSE = "BSD | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
index 5615473..5eebaea 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "Qt Debug Bridge Daemon"
 SECTION = "devel"
-LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit distro_features_check
diff --git a/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
index 5bc09c0..a463cea 100644
--- a/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
+++ b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
@@ -28,8 +28,8 @@
 ############################################################################
 
 DESCRIPTION = "Qt Installer Framework"
-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 bin_package native
 
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index f445233..6313c5c 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Qt Device Utilities"
-LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "1dabfa51cb834efd85ccb60e70e2ce3558b4deaf"
+SRCREV = "0ecd391912f6338d5aef6105600fc8c321c83bd8"
 
 DEPENDS = "\
     qtbase qtdeclarative qtconnectivity qtdeclarative-native \
diff --git a/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
index 0f942e7..a5a05f2 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "QtGlesStream"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=875f34471470b09977705aed7863e440"
 
 inherit qt5-module
diff --git a/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
index 495598a..650624f 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "Qt OTA Update module"
-LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
diff --git a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
index 9e6b051..a28022d 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -28,17 +28,18 @@
 ############################################################################
 
 DESCRIPTION = "Qt Quick Timeline"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+LICENSE = "( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    "
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "7ee1adca536b422623de1fe8da44135aeee6e9cf"
-BRANCH = "dev"
+DEPENDS = "qtbase qtdeclarative"
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qtquicktimeline;branch=${BRANCH};protocol=ssh \
-    "
+QT_MODULE_BRANCH = "dev"
 
-DEPENDS = "qtbase qtdeclarative"
+SRCREV = "42415a5b7a13b92701ccc7be70f9cdb7e522a3ea"
diff --git a/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb b/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
index c4c8d21..0e2185d 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
@@ -28,7 +28,7 @@
 ############################################################################
 
 DESCRIPTION = "QtSimulator"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://src/simulator/simulatorglobal.h;md5=3daa1a609195439d0292259a74c7d615;beginline=1;endline=20"
 
 inherit qt5-module