summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libjpeg
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-05-31 12:59:43 +0200
committerKai Koehne <kai.koehne@qt.io>2016-08-12 06:55:01 +0000
commit492ca3e503c77cc5f41eb0a6c232d39b876f8d91 (patch)
tree6a7fe2dc0a82c6c6055e8f9b9a12ebca5fef7ec6 /src/3rdparty/libjpeg
parent8e29d463dc6f5f91dc03f638115b491732c1ff76 (diff)
Add qt_attribution.json files
The format is documented in http://wiki.qt.io/Qt_attribution.json Also add a LICENSE file in case there is none yet (usually copied from the source headers). Task-number: QTBUG-55139 Change-Id: Ib54c73d0bb9946cfd8579e86c6858035184ca516 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg')
-rw-r--r--src/3rdparty/libjpeg/LICENSE50
-rw-r--r--src/3rdparty/libjpeg/qt_attribution.json13
2 files changed, 63 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/LICENSE b/src/3rdparty/libjpeg/LICENSE
new file mode 100644
index 0000000000..797a6d5668
--- /dev/null
+++ b/src/3rdparty/libjpeg/LICENSE
@@ -0,0 +1,50 @@
+from qtbase/src/3rdparty/libjpeg/README:
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works. (But if you find any bugs,
+ please let us know!)
+2. You can use this software for whatever you want. You don't have to pay us.
+3. You may not pretend that you wrote this software. If you use it in a
+ program, you must acknowledge somewhere in your documentation that
+ you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose. This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library. If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it. This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json
new file mode 100644
index 0000000000..ee5c094a0f
--- /dev/null
+++ b/src/3rdparty/libjpeg/qt_attribution.json
@@ -0,0 +1,13 @@
+{
+ "Id": "libjpeg",
+ "Name": "LibJPEG",
+ "QDocModule": "qtgui",
+ "QtUsage": "Used in the QJPEG image plugin. Configure with -no-jpeg to avoid.",
+
+ "Description": "The Independent JPEG Group's JPEG software",
+ "Homepage": "http://www.ijg.org/",
+ "License": "Independent JPEG Group License",
+ "LicenseId": "IJG",
+ "LicenseFile": "LICENSE",
+ "Copyright": "Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding."
+}