diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-05-17 13:13:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-04 11:50:59 +0000 |
| commit | b29941f6dbf03440aeedbacf7045badc7f497f87 (patch) | |
| tree | d5f1854cc05c1424ff35154a8629db2ff43f98d6 /src/3rdparty/libjpeg/qt_attribution.json | |
| parent | 98fcf3cb611fe895e6998726ae39bdd30512c98b (diff) | |
Fix license information for libjpeg-turbo
Fix the license metadata in that libjpeg contains parts under three
different bsd-like licenses. Also, do include the IJG, zlib
license texts in the metadata.
[ChangeLog][Third-Party Code] Clarified that libjpeg-turbo is actually
covered by three licenses, not only IJG.
Change-Id: I6c4e3e8577bdf83e7e73474b34b0553cbe1d9b6d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 467b39d52c9ab59b1e7518330fbb51d5543ada50)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libjpeg/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/libjpeg/qt_attribution.json | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json index 0940636da3..04b89a05bc 100644 --- a/src/3rdparty/libjpeg/qt_attribution.json +++ b/src/3rdparty/libjpeg/qt_attribution.json @@ -7,19 +7,8 @@ "Description": "The Independent JPEG Group's JPEG software", "Homepage": "http://libjpeg-turbo.virtualgl.org/", "Version": "2.1.0", - "License": "Independent JPEG Group License", - "LicenseId": "IJG", - "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 2009-2021 D. R. Commander -Copyright (C) 2015, 2020 Google, Inc. -Copyright (C) 2019 Arm Limited -Copyright (C) 2015-2016, 2018 Matthieu Darbois -Copyright (C) 2011-2016 Siarhei Siamashka -Copyright (C) 2015 Intel Corporation -Copyright (C) 2013-2014 Linaro Limited -Copyright (C) 2013-2014 MIPS Technologies, Inc. -Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB -Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) -Copyright (C) 1999-2006 MIYASAKA Masaru -Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding" + "License": "Independent JPEG Group License and BSD 3-Clause \"New\" or \"Revised\" License and zlib License", + "LicenseId": "IJG AND BSD-3-Clause AND Zlib", + "LicenseFiles": [ "LICENSE", "ijg-license.txt", "zlib-license.txt"], + "CopyrightFile": "COPYRIGHT.txt" } |