diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-04 13:07:26 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-14 07:34:09 +0000 |
commit | 494e4fa32427230954f301cc0e8f6e7cdab4654e (patch) | |
tree | 563497a4ff1794e0bb1008fd67abaeefe53b34fb /meta-boot2qt-distro/recipes-qt | |
parent | 7608ebe44f65f4d525081cf9a5b12cfa05792a8f (diff) | |
download | meta-boot2qt-494e4fa32427230954f301cc0e8f6e7cdab4654e.tar.gz |
Update Qt license agreement
Include the latest Qt License Agreement version 4.0, as it's available
in qtbase. Use the same filename as used in meta-qt5 layer, so this license
will be used in all Qt recipes that use The-Qt-Company-Commercial license.
Change-Id: Ic02eb2c6c6d210ad30ee6a65d23afaa5b8b68589
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt')
14 files changed, 20 insertions, 20 deletions
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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "B2Qt Automotive Qt5 image" | 30 | DESCRIPTION = "B2Qt Automotive Qt5 image" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
33 | 33 | ||
34 | DEPLOY_CONF_TYPE = "Qt Automotive Suite $QT_VERSION" | 34 | DEPLOY_CONF_TYPE = "Qt Automotive Suite $QT_VERSION" |
35 | 35 | ||
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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "B2Qt on embedded Linux SDK image" | 30 | DESCRIPTION = "B2Qt on embedded Linux SDK image" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | PR = "r0" | 32 | PR = "r0" |
33 | 33 | ||
34 | IMAGE_FEATURES += "\ | 34 | 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..4c58a00 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 | |||
@@ -28,8 +28,8 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "B2Qt embedded Qt5 image" | 30 | DESCRIPTION = "B2Qt embedded Qt5 image" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
33 | PR = "r0" | 33 | PR = "r0" |
34 | 34 | ||
35 | DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION" | 35 | 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 @@ | |||
29 | 29 | ||
30 | DESCRIPTION = "Meta task for QBSP creation" | 30 | DESCRIPTION = "Meta task for QBSP creation" |
31 | 31 | ||
32 | LICENSE = "The-Qt-Company-DCLA-2.1" | 32 | LICENSE = "The-Qt-Company-Commercial" |
33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
34 | 34 | ||
35 | # get Qt version number | 35 | # get Qt version number |
36 | require recipes-qt/qt5/qt5-git.inc | 36 | 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 @@ | |||
29 | 29 | ||
30 | DESCRIPTION = "Meta task for QBSP creation" | 30 | DESCRIPTION = "Meta task for QBSP creation" |
31 | 31 | ||
32 | LICENSE = "The-Qt-Company-DCLA-2.1" | 32 | LICENSE = "The-Qt-Company-Commercial" |
33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
34 | 34 | ||
35 | # get Qt version number | 35 | # get Qt version number |
36 | require recipes-qt/qt5/qt5-git.inc | 36 | 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 @@ | |||
29 | 29 | ||
30 | DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" | 30 | DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" |
31 | 31 | ||
32 | LICENSE = "The-Qt-Company-DCLA-2.1" | 32 | LICENSE = "The-Qt-Company-Commercial" |
33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
34 | 34 | ||
35 | inherit populate_b2qt_qt5_sdk | 35 | inherit populate_b2qt_qt5_sdk |
36 | 36 | ||
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 @@ | |||
29 | 29 | ||
30 | DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" | 30 | DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" |
31 | 31 | ||
32 | LICENSE = "The-Qt-Company-DCLA-2.1" | 32 | LICENSE = "The-Qt-Company-Commercial" |
33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 33 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" |
34 | 34 | ||
35 | inherit populate_b2qt_qt5_sdk | 35 | inherit populate_b2qt_qt5_sdk |
36 | 36 | ||
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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK" | 30 | DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | PR = "r0" | 32 | PR = "r0" |
33 | 33 | ||
34 | inherit nativesdk packagegroup | 34 | 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" | 30 | DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | PR = "r0" | 32 | PR = "r0" |
33 | 33 | ||
34 | inherit nativesdk packagegroup | 34 | 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Automotive specific Qt packages" | 30 | DESCRIPTION = "Automotive specific Qt packages" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | 32 | ||
33 | inherit packagegroup | 33 | inherit packagegroup |
34 | 34 | ||
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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK" | 30 | DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | PR = "r0" | 32 | PR = "r0" |
33 | 33 | ||
34 | inherit packagegroup | 34 | 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Device Creation specific Qt packages" | 30 | DESCRIPTION = "Device Creation specific Qt packages" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | 32 | ||
33 | inherit packagegroup | 33 | inherit packagegroup |
34 | 34 | ||
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..646239f 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" | 30 | DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | PR = "r0" | 32 | PR = "r0" |
33 | 33 | ||
34 | inherit packagegroup | 34 | inherit packagegroup |
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 ba20618..cd5f35f 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Qt5 modules" | 30 | DESCRIPTION = "Qt5 modules" |
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-Commercial" |
32 | 32 | ||
33 | inherit packagegroup | 33 | inherit packagegroup |
34 | 34 | ||