summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libjpeg/zlib-license.txt
Commit message (Collapse)AuthorAgeFilesLines
* Update bundled libjpeg-turbo to version 3.0.3Eirik Aavitsland7 days1-15/+0
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 3.0.3 Pick-to: 6.7 6.5 6.2 5.15 Change-Id: I1f7184959d84bc3b486f495d782755fd6f9cbaa4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Fix license information for libjpeg-turboKai Köhne2021-06-041-0/+15
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. Pick-to: 6.1 6.0 Change-Id: I6c4e3e8577bdf83e7e73474b34b0553cbe1d9b6d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>