updated links to include modules and removed ptmalloc

Partly fixes QTBUG-28534 and QTBUG-28533
- added Angle section tag
- updated all paths
- updated freetype, libpng and SQLlite versions
- removed ptmalloc3 since no longer used

Change-Id: Ibb6697074b6bf3d50bd7ecf821feae184bd265c3
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 33 insertions, 62 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 88cd1a5d0..c2e3b49f3 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -51,7 +51,7 @@
 
     \tableofcontents
 
-    \section1 FreeType 2 (\c freetype) version 2.3.6
+    \section1 FreeType 2 (\c freetype) version 2.3.9
 
     \e{The FreeType project is a team of volunteers who develop free, portable
     and high-quality software solutions for digital typography. We specifically
@@ -61,7 +61,7 @@
     See \c qtbase/src/3rdparty/freetype/docs/FTL.txt and \c
     qtbase/src/3rdparty/freetype/docs/GPL.txt for license details.
 
-    See also the files in \c src/3rdparty/harfbuzz, which are used by
+    See also the files in \c qtbase/src/3rdparty/harfbuzz, which are used by
     FreeType.
 
     Parts of the FreeType projects have been modified and put into Qt
@@ -136,7 +136,7 @@
     \section1 HarfBuzz (\c harfbuzz)
 
     \e{This is HarfBuzz, an OpenType Layout engine library.}
-    -- quoted from \c src/3rdparty/harfbuzz/README.
+    -- quoted from \c qtbase/src/3rdparty/harfbuzz/README.
 
     \hr
 
@@ -167,7 +167,7 @@
 
     \hr
 
-    See \c src/3rdparty/harfbuzz/COPYING for license details.
+    See \c qtbase/src/3rdparty/harfbuzz/COPYING for license details.
 
     \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 8c
 
@@ -177,7 +177,7 @@
     "real-world" scenes; line drawings, cartoons and other non-realistic images
     are not its strong suit.  JPEG is lossy, meaning that the output image is not
     exactly identical to the input image.} -- quoted from \c
-    src/3rdparty/libjpeg/README.
+    qtbase/src/3rdparty/libjpeg/README.
 
     \hr
 
@@ -228,16 +228,16 @@
 
     \hr
 
-    See \c src/3rdparty/libjpeg/README for license details.
+    See \c qtbase/src/3rdparty/libjpeg/README for license details.
 
     \section1 MD4 (\c md4.cpp and \c md4.h)
 
-    \e{MD4 (RFC-1320) message digest.\br
-    Modified from MD5 code by Andrey Panin <pazke@donpac.ru>\br\br
-    Written by Solar Designer <solar@openwall.com> in 2001, and placed in\br
+    \e{MD4 (RFC-1320) message digest.}\br
+    \e{Modified from MD5 code by Andrey Panin <pazke@donpac.ru>
+    Written by Solar Designer <solar@openwall.com> in 2001, and placed in
     the public domain.  There's absolutely no warranty.}
 
-    See \c src/3rdparty/md4/md4.cpp and \c src/3rdparty/md4/md4.h for more
+    See \c qtbase/src/3rdparty/md4/md4.cpp and \c qtbase/src/3rdparty/md4/md4.h for more
     information about the terms and conditions under which the code is
     supplied.
 
@@ -247,9 +247,9 @@
     The algorithm is due to Ron Rivest.  This code was
     written by Colin Plumb in 1993, no copyright is claimed.
     This code is in the public domain; do with it what you wish.} -- quoted from
-    \c src/3rdparty/md5/md5.h
+    \c qtbase/src/3rdparty/md5/md5.h
 
-    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
+    See \c qtbase/src/3rdparty/md5/md5.cpp and \c qtbase/src/3rdparty/md5/md5.h for more
     information about the terms and conditions under which the code is
     supplied.
 
@@ -260,16 +260,16 @@
     image files. It uses the zlib compression library, and optionally the
     JPEG library by the Independant JPEG Group (IJG) and/or
     lcms (little cms), a color-management library by Marti Maria Saguer.}
-    -- quoted from \c src/3rdparty/libmng/doc/libmng.txt
+    -- quoted from \c qtimageformats/src/3rdparty/libmng/doc/libmng.txt
 
-    See \c src/3rdparty/libmng/LICENSE for license details.
+    See \c qtimageformats/src/3rdparty/libmng/LICENSE for license details.
 
-    \section1 PNG Reference Library (\c libpng) version 1.5.1
+    \section1 PNG Reference Library (\c libpng) version 1.5.10
 
     \e{Libpng was written as a companion to the PNG specification, as a way
     of reducing the amount of time and effort it takes to support the PNG
     file format in application programs.} -- quoted from \c
-    src/3rdparty/libpng/libpng-manual.txt.
+    qtbase/src/3rdparty/libpng/libpng-manual.txt.
 
     \hr
 
@@ -359,48 +359,17 @@
     
     \hr
 
-    See \c src/3rdparty/libpng/LICENSE for license details.
-
-    \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
-
-    \e ptmcalloc3 is a scalable concurrent memory allocator suitable
-    for use in multi-threaded programs.
-
-    \hr
-
-    Copyright (c) 2001-2006 Wolfram Gloger
-
-    Permission to use, copy, modify, distribute, and sell this software
-    and its documentation for any purpose is hereby granted without fee,
-    provided that (i) the above copyright notices and this permission
-    notice appear in all copies of the software and related documentation,
-    and (ii) the name of Wolfram Gloger may not be used in any advertising
-    or publicity relating to the software.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
-    INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
-    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
-    OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-
-    \hr
-
-    See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
+    See \c qtbase/src/3rdparty/libpng/LICENSE for license details.
 
     \section1 SHA-1 (\c sha1.cpp)
 
     \e{Based on the public domain implementation of the SHA-1 algorithm\br
     Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>}
 
-    See \c src/3rdparty/sha1/sha1.cpp for more information about the terms and
+    See \c qtbase/src/3rdparty/sha1/sha1.cpp for more information about the terms and
     conditions under which the code is supplied.
 
-    \section1 SQLite (\c sqlite) version 3.5.9
+    \section1 SQLite (\c sqlite) version 3.7.7.1
 
     \e{SQLite is a small C library that implements a
     self-contained, embeddable, zero-configuration SQL database engine.}
@@ -415,7 +384,7 @@
 
     \e {libtiff is a set of C functions (a library) that support the
     manipulation of TIFF image files.} -- quoted from \c
-    src/libtiff/html/libtiff.html
+    qtimageformats/src/libtiff/html/libtiff.html
 
     \hr
 
@@ -531,21 +500,21 @@
 
     \hr
 
-    See \c src/3rdparty/libtiff/README for license details.
+    See \c qtimageformats/src/3rdparty/libtiff/README for license details.
 
     \section1 Wintab API (\c wintab)
 
     Wintab is a de facto API for pointing devices on Windows. The
     wintab code is from \l{http://www.pointing.com/WINTAB.HTM}.
 
-    See \c src/3rdparty/wintab/wintab.h for license details.
+    See \c qtbase/src/3rdparty/wintab/wintab.h for license details.
 
     \section1 Data Compression Library (\c zlib) version 1.2.5
 
     \e{zlib is a general purpose data compression library.  All the code
     is thread safe.  The data format used by the zlib library is described
     by RFCs (Request for Comments) 1950 to 1952} -- quoted from \c
-    src/3rdparty/zlib/README.
+    qtbase/src/3rdparty/zlib/README.
 
     \hr
     
@@ -569,7 +538,7 @@
 
     \hr
 
-    See \c src/3rdparty/zlib/README for license details.
+    See \c qtbase/src/3rdparty/zlib/README for license details.
 
     \section1 JavaScriptCore
 
@@ -587,7 +556,7 @@
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
-    See \c src/3rdparty/webkit/JavaScriptCore/wtf/dtoa.cpp for license details.
+    See \c qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp for license details.
 
     \hr
 
@@ -647,7 +616,7 @@
 
     \e{pixman is a library that provides low-level pixel manipulation
     features such as image compositing and trapezoid rasterization.} -- quoted
-    from \c src/3rdparty/pixman/README
+    from \c qtbase/src/3rdparty/pixman/README
 
     We are only using the pixman-arm-neon-asm.h and pixman-arm-neon-asm.S
     source files which have the following copyright and license header:
@@ -679,8 +648,8 @@
 
     \hr
 
-    See \c src/3rdparty/pixman/pixman-arm-neon-asm.h and
-    \c src/3rdparty/pixman/pixman-arm-neon-asm.S
+    See \c qtbase/src/3rdparty/pixman/pixman-arm-neon-asm.h and
+    \c qtbase/src/3rdparty/pixman/pixman-arm-neon-asm.S
 
     \section1 WebCore (WebKit)
 
@@ -884,7 +853,7 @@
     mentioned above being set in the cookie jar supported by Qt (by the
     QNetworkCookieJar class).
 
-    See \c src/network/access/qnetworkcookiejartlds_p.h.INFO for more
+    See \c qtbase/src/network/access/qnetworkcookiejartlds_p.h.INFO for more
     information about how the list is used.
 
 
@@ -953,6 +922,8 @@
 
     \hr
 
+    \section1 ANGLE (\c angle)
+
     Copyright (c) 2002, NVIDIA Corporation.
 
     NVIDIA Corporation("NVIDIA") supplies this software to you in
@@ -996,7 +967,7 @@
     NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     \list
-    \li Parts of ANGLE in \c{src/3rdparty/angle/src/compiler/preprocessor}
+    \li Parts of ANGLE in \c{qtbase/src/3rdparty/angle/src/compiler/preprocessor}
     \endlist
 
     \hr
@@ -1035,6 +1006,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 
     \list
-    \li The ANGLE project in \c{src/3rdparty/angle}
+    \li The ANGLE project in \c{qtbase/src/3rdparty/angle}
     \endlist
 */