summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2014-11-21 08:47:46 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-21 11:40:42 +0100
commitd7bc0695d9fe18f412604543b596715babc332f7 (patch)
treea0ed8cde9c25c87647e75ef23353bb1f3ed8492c
parente96d2de6f6cad386901f0d9d6e0cc421951864c9 (diff)
downloadqtdoc-d7bc0695d9fe18f412604543b596715babc332f7.tar.gz
Doc: Update Qt licensing documentation
Add information about the license for WebP (libwebp) version 0.4.0 which is in Qt Image Formats module. Task-number: QTBUG-42710 Change-Id: Ia0047c59d162081b901420979240bef2c0cda962 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/src/legal/3rdparty.qdoc42
-rw-r--r--doc/src/legal/licenses.qdoc2
2 files changed, 44 insertions, 0 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index d670b89c..6ecafba9 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -1783,4 +1783,46 @@
\list
\li From \c {qtwayland/src/3rdparty/protocol/wayland.xml}
\endlist
+
+ \section1 WebP (libwebp) version 0.4.0
+
+ \e {WebP is a new image format that provides lossless and lossy
+ compression for images on the web.}
+ -- quoted from \l{https://developers.google.com/speed/webp}.
+
+ \hr
+
+ Copyright (c) 2010, Google Inc. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the name of Google nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ \hr
+
+ See \c qtimageformats/src/3rdparty/libwebp/COPYING for license details.
*/
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index bcf22cb9..57a30e03 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -288,6 +288,8 @@
\li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li
\row \li \l{MNG Library (libmng) version 1.0.10}{MNG}
\li Support decoding and displaying of MNG format image files. \li BSD-style \li
+ \row \li \l{WebP (libwebp) version 0.4.0}{WebP}
+ \li Support decoding and displaying of WebP format image files. \li BSD-style \li
\row \li \li \li \li
\row \li \li \li \li