diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 6ecafba9261cfe6472e3ec4a84e1beb2e755bf01..b86d855681b124b99a09da8a60a1e124b1f87803 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -169,6 +169,66 @@
See \c qtbase/src/3rdparty/harfbuzz/COPYING for license details.
+ \section1 JasPer (libjasper) version 2.0
+
+ \e {JasPer is a collection of software (i.e., a library and application
+ programs) for the coding and manipulation of images.}
+
+ \badcode
+ JasPer License Version 2.0
+
+ Copyright (c) 2001-2006 Michael David Adams
+ Copyright (c) 1999-2000 Image Power, Inc.
+ Copyright (c) 1999-2000 The University of British Columbia
+
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person (the
+ "User") obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ 1. The above copyright notices and this permission notice (which
+ includes the disclaimer below) shall be included in all copies or
+ substantial portions of the Software.
+
+ 2. The name of a copyright holder shall not be used to endorse or
+ promote products derived from the Software without specific prior
+ written permission.
+
+ THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+ LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+ THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
+ "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. NO ASSURANCES ARE
+ PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
+ THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
+ EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
+ BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
+ PROPERTY RIGHTS OR OTHERWISE. AS A CONDITION TO EXERCISING THE RIGHTS
+ GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
+ ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY. THE SOFTWARE
+ IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
+ SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
+ AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
+ SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
+ THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
+ PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
+ RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
+ EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+ \endcode
+
+ See \c qtimageformats/src/3rdparty/jasper/LICENSE.
+
\section1 JPEG Software (libjpeg) version 8c
\e{This package contains C software to implement JPEG image compression and
@@ -252,6 +312,34 @@
information about the terms and conditions under which the code is
supplied.
+ \section1 Mesa 3D Graphics Library
+
+ \e {Mesa is a 3-D graphics library with an API which is very similar to that
+ of OpenGL}.
+
+ \badcode
+ Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ \endcode
+
+ See \l {http://www.mesa3d.org/license.html} for details.
+
\section1 MNG Library (libmng) version 1.0.10
\e{The libmng library supports decoding, displaying, encoding, and various
@@ -1613,7 +1701,7 @@
\section1 Poly2tri
\e{Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.}
- \code
+ \badcode
Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
http://code.google.com/p/poly2tri/
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 0d5b559c70958f68502222fe96385dcf138f99e7..a38a6bdda2cf5ef9563782df3bea4dfb528c0469 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -138,13 +138,14 @@
\li implements the MD4 message-digest algorithm. \li BSD \li
\row \li \l{MD5 (md5.cpp and md5.h)}{MD5}
\li implements the MD5 message-digest algorithm. \li BSD \li
+ \row \li \l {Mesa 3D Graphics Library}{Mesa llvmpipe}
+ \li Mesa llvmpipe software rasterizer backend (\c opengl32sw.dll) for Windows builds. \li MIT \li \l {Qt for Windows}
\row \li \l{SHA-1 (sha1.cpp)}{SHA-1}
\li implements the SHA-1 encryption algorithm. \li BSD \li
\row \li \l{SHA-3, originally known as Keccak}{SHA-3}
\li implements the SHA-3 encryption algorithm. \li BSD \li
\row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib}
\li zlib is a general purpose data compression library. \li BSD-style \li
- \row \li \li \li \li
\row \li {1,12} Qt Gui
\row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
@@ -284,6 +285,8 @@
\row \li {1,6} Qt Image Formats
\row \li {4,1} \b{Third-party Licenses}
+ \row \li \l{JasPer (libjasper) version 2.0}{JasPer}
+ \li A collection of software for the coding and manipulation of images. \li BSD-style \li
\row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF}
\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}
@@ -360,10 +363,6 @@
See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
- \hr
-
- \generatelist legalese
-
\section1 Native Style for Android
\legalese