diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2022-03-24 12:40:43 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-12 09:15:44 +0000 |
commit | 70c0deb41bf0f2cd10738850eff2baa443ad3c7d (patch) | |
tree | 8ce8ca02b6968502e3cfcb44af504c6315f12062 | |
parent | 8cf4c7778cd6a06376bcabaed392801b6a81a10c (diff) |
Update The-Qt-Company-Commercial
Newest version is 4.4.1 so update it in the git as well
Task-number: QTBUG-101714
Change-Id: I206a75f346cfc7d34f75f28fefa001f4a3c1207f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 328c1fd663d9d7a4fa63dcf1db8e9eb5fc6041d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
8 files changed, 11 insertions, 11 deletions
diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb index b264b156..951f3ed7 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb @@ -29,7 +29,7 @@ SUMMARY = "Initramfs with early load intel microcode" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" inherit deploy nopackages diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb index acce628d..eb37418f 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-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=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION" 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 2e55807e..b5afe33b 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=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" # get Qt version number require recipes-qt/qt6/qt6-git.inc diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb index 05ed0186..d5802eac 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb @@ -30,7 +30,7 @@ DESCRIPTION = "Qt6 SDK toolchain for CI use" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" inherit populate_sdk diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb index a7085641..fb3b07c4 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb @@ -30,7 +30,7 @@ DESCRIPTION = "B2Qt embedded Qt6 SDK toolchain" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" inherit populate_b2qt_qt6_sdk diff --git a/meta-boot2qt/licenses/The-Qt-Company-Commercial b/meta-boot2qt/licenses/The-Qt-Company-Commercial index 7487df85..8d68b15d 100644 --- a/meta-boot2qt/licenses/The-Qt-Company-Commercial +++ b/meta-boot2qt/licenses/The-Qt-Company-Commercial @@ -1,5 +1,5 @@ QT LICENSE AGREEMENT -Agreement version 4.4 +Agreement version 4.4.1 This Qt License Agreement ("Agreement") is a legal agreement for the licensing of Licensed Software (as defined below) between The Qt Company (as defined @@ -233,7 +233,7 @@ Appendix 9 hereto. United States or a legal entity incorporated outside of the United States or having its registered office outside of the United States, The Qt Company Ltd., a Finnish company with its registered office at - Bertel Jungin aukio D3A, 02600 Espoo, Finland. + Miestentie 7, 02150 Espoo, Finland. "Third-Party Software" shall have the meaning set forth in Section 4. @@ -1054,8 +1054,8 @@ The Agreement includes following Appendices 1-10, as applicable. - Appendix 1: Licensed Software details - Appendix 2: Pricing - Appendix 3: Add-on Software details (optional) -- Appendix 4: Non-commercial and educational Licenses (optional) -- Appendix 5: Small business and startup Licenses (optional) +- Appendix 4: Small business and startup Licenses (optional) +- Appendix 5: Non-commercial and educational Licenses (optional) - Appendix 6: License Reporting (optional) - Appendix 7: Marketing Rights (optional) - Appendix 8: Intentionally left blank (optional) diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb index 0f5cf8fb..1e42a9dd 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb @@ -29,7 +29,7 @@ SUMMARY = "Device specific installation instructions for the QBSP" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" inherit deploy nopackages diff --git a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb index 994b72a1..06f88e7e 100644 --- a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb +++ b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Qt Installer Framework" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=38de3b110ade3b6ee2f0b6a95ab16f1a" inherit bin_package native |