diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-11 09:29:17 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-11 09:29:17 +0200 |
| commit | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (patch) | |
| tree | cc68622c9b85992d99a8373ab55471ee821a4ebf /src/3rdparty/libjpeg | |
| parent | ab28ff2207e8f33754c79793089dbf943d67736d (diff) | |
| parent | ebb49c66aaf22ed55d62ff7bc3690fce00b7d8ba (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I569a2246c9e8d70430e8c5405b9f3df2218078ee
Diffstat (limited to 'src/3rdparty/libjpeg')
| -rw-r--r-- | src/3rdparty/libjpeg/COPYRIGHT.txt | 12 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/qt_attribution.json | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/3rdparty/libjpeg/COPYRIGHT.txt b/src/3rdparty/libjpeg/COPYRIGHT.txt deleted file mode 100644 index cfeb0eacfc..0000000000 --- a/src/3rdparty/libjpeg/COPYRIGHT.txt +++ /dev/null @@ -1,12 +0,0 @@ -Copyright (C) 2009-2021 D. R. Commander -Copyright (C) 2015, 2020 Google, Inc. -Copyright (C) 2019-2020 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-2020 Thomas G. Lane, Guido Vollbeding diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json index ff4d98fb54..b68563cb79 100644 --- a/src/3rdparty/libjpeg/qt_attribution.json +++ b/src/3rdparty/libjpeg/qt_attribution.json @@ -10,5 +10,16 @@ "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" + "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" } |