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/COPYRIGHT.txt | |
| 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/COPYRIGHT.txt')
| -rw-r--r-- | src/3rdparty/libjpeg/COPYRIGHT.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/COPYRIGHT.txt b/src/3rdparty/libjpeg/COPYRIGHT.txt new file mode 100644 index 0000000000..6d80d7dc77 --- /dev/null +++ b/src/3rdparty/libjpeg/COPYRIGHT.txt @@ -0,0 +1,12 @@ +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 |