aboutsummaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-02-19 12:01:09 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-02-19 12:03:51 +0200
commit555b13a8d07a5207a0f1abc5bb5aad2a951343f5 (patch)
treec394994e4438a652bc546814d8f05e9f833d78b9 /meta-boot2qt-distro
parent141cb4a13fc2071659f55064a3f2f7a06a2ae2a1 (diff)
parent4a5a1516cb18640c29c50aa042b419e2d08184c1 (diff)
Merge remote-tracking branch 'qt/sumo' into thud
* qt/sumo: 4a5a1516 Update Qt license agreement ff98b95f neptune: hide mouse cursor 59bfc2dd (tag: v5.12.7) meta-qt5: update layer b7748d9e meta-qt5: update layer bda95097 boot2qt-demos: update revision 0fdffd2a Update automotive sha1s for 5.12.6 in sumo branch 57413cee Update automotive sha1s for 5.12.6 in sumo branch 22f1058a (tag: v5.12.6) meta-qt5: update layer 5c6f2889 meta-qt5: update layer Conflicts: meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb meta-boot2qt/recipes-qt/automotive/qmllive_git.bb meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb meta-boot2qt/recipes-qt/automotive/qtivi_git.bb meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc scripts/manifest.xml Change-Id: I4e84f549b7254910328aaa93c8afb9346ad3a1c3
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb2
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb2
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 c5b9f8f4..77fce509 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
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 5eb1e74d..ce8db3a1 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
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 8971d953..47dce856 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
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 3227eba1..b0793d2a 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
# 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 774d73fd..eef2c1d8 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
# 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 afefc8d4..6b4e92f7 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
# 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 0f935351..eca89071 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
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 aa8d8b0f..4d06cde6 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
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 4d0db5fc..3ff6a888 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://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
+LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
inherit populate_b2qt_qt5_sdk