diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:56 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:56 +0300 |
| commit | e89a6f03c4d24f18db36a906a7320035388504ba (patch) | |
| tree | 47f7edb9faa26f6f4e2d3f2eea12133933d86e45 /src/3rdparty/libjpeg/qt_attribution.json | |
| parent | c8989ca20fa5798f7853f07df6e150cc407c64a4 (diff) | |
| parent | 69b8ab23c93785dc69ae43ea04d5620656a4af44 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensource
Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb
Diffstat (limited to 'src/3rdparty/libjpeg/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/libjpeg/qt_attribution.json | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json index 796829e215..a1dd9990c4 100644 --- a/src/3rdparty/libjpeg/qt_attribution.json +++ b/src/3rdparty/libjpeg/qt_attribution.json @@ -6,19 +6,20 @@ "Description": "The Independent JPEG Group's JPEG software", "Homepage": "http://libjpeg-turbo.virtualgl.org/", - "Version": "2.0.5", + "Version": "2.0.6", "License": "Independent JPEG Group License", "LicenseId": "IJG", "LicenseFile": "LICENSE", "Copyright": "Copyright (C) 2009-2020 D. R. Commander -Copyright (C) 2011-2016 Siarhei Siamashka +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) 2015 Google, Inc. +Copyright (C) 2013-2014 Linaro Limited Copyright (C) 2013-2014 MIPS Technologies, Inc. -Copyright (C) 2013 Linaro Limited +Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) -Copyright (C) 2009 Pierre Ossman for Cendio AB Copyright (C) 1999-2006 MIYASAKA Masaru -Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding" +Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding" } |