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

License related change from commit "df96751 Whitelist path for Qt license"
adapted for qtsaferenderer_git.bb recipe.

* origin/sumo:
  c3d680b meta-qt5: update layer
  47b1e2d meta-qt5: update layer
  df96751 Whitelist path for Qt license
  e6d9567 meta-qt5: update layer
  af511a9 boot2qt-demos: use qt5-git.inc
  306683b qtdeviceutilities: update to latest revision
  7170c0e qtquicktimeline: update to v1.0.0

Conflicts:
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
  meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
  meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
  scripts/manifest.xml

Change-Id: Ib8edb2364a7a41e0046ded370626acd953e48dde

9 files changed, 9 insertions, 9 deletions

diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
index 2442a39c..c5b9f8f4 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "B2Qt Automation Qt5 image"
 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"
 
 DEPLOY_CONF_TYPE = "Qt for Automation ($QT_VERSION)"
 
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 eb5232e0..5eb1e74d 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
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "B2Qt Automotive Qt5 image"
 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"
 
 DEPLOY_CONF_TYPE = "Qt Automotive Suite $QT_VERSION"
 
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 1c49bc4d..8971d953 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
@@ -29,7 +29,7 @@
 
 SUMMARY = "Qt for Device Creation Demo Image"
 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"
 
 DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION"
 
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
index 16a15307..3227eba1 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
@@ -30,7 +30,7 @@
 DESCRIPTION = "Meta task for QBSP creation"
 
 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"
 
 # get Qt version number
 require recipes-qt/qt5/qt5-git.inc
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 fe2ab16a..774d73fd 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
@@ -30,7 +30,7 @@
 DESCRIPTION = "Meta task for QBSP creation"
 
 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"
 
 # 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 c85d3baf..afefc8d4 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
@@ -30,7 +30,7 @@
 DESCRIPTION = "Meta task for QBSP creation"
 
 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"
 
 # get Qt version number
 require recipes-qt/qt5/qt5-git.inc
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
index 8cd0d044..0f935351 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
@@ -30,7 +30,7 @@
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
 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"
 
 inherit populate_b2qt_qt5_sdk
 
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 11ce7861..aa8d8b0f 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
@@ -30,7 +30,7 @@
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
 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"
 
 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 6841cdbc..4d0db5fc 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
@@ -30,7 +30,7 @@
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
 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"
 
 inherit populate_b2qt_qt5_sdk