summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libjpeg/zlib-license.txt
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-05-17 13:13:32 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-04 11:50:59 +0000
commitb29941f6dbf03440aeedbacf7045badc7f497f87 (patch)
treed5f1854cc05c1424ff35154a8629db2ff43f98d6 /src/3rdparty/libjpeg/zlib-license.txt
parent98fcf3cb611fe895e6998726ae39bdd30512c98b (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/zlib-license.txt')
-rw-r--r--src/3rdparty/libjpeg/zlib-license.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/zlib-license.txt b/src/3rdparty/libjpeg/zlib-license.txt
new file mode 100644
index 0000000000..480c61edca
--- /dev/null
+++ b/src/3rdparty/libjpeg/zlib-license.txt
@@ -0,0 +1,15 @@
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.