Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

5 files changed, 87 insertions, 61 deletions

diff --git a/doc/src/3rdparty.qdoc b/doc/src/3rdparty.qdoc
index a87878e..23dfb12 100644
--- a/doc/src/3rdparty.qdoc
+++ b/doc/src/3rdparty.qdoc
@@ -61,6 +61,15 @@
 
     \tableofcontents
 
+    \section1 DES (\c des.cpp)
+
+    \e{Implementation of DES encryption for NTLM\br
+    Copyright 1997-2005 Simon Tatham.\br
+    This software is released under the MIT license.}
+
+    See \c src/3rdparty/des/des.cpp for more information about the terms and
+    conditions under which the code is supplied.
+
     \section1 FreeType 2 (\c freetype) version 2.3.6
 
     \e{The FreeType project is a team of volunteers who develop free, portable
@@ -108,18 +117,6 @@
     See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
     for license details.
 
-    \section1 MD5 (\c md5.cpp and \c md5.h)
-
-    \e{This code implements the MD5 message-digest algorithm.
-    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
-
-    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
-    information about the terms and conditions under which the code is
-    supplied.
-
     \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
 
     \e{This package contains C software to implement JPEG image compression and
@@ -132,6 +129,29 @@
 
     See \c 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
+    the public domain.  There's absolutely no warranty.}
+
+    See \c src/3rdparty/md4/md4.cpp and \c src/3rdparty/md4/md4.h for more
+    information about the terms and conditions under which the code is
+    supplied.
+
+    \section1 MD5 (\c md5.cpp and \c md5.h)
+
+    \e{This code implements the MD5 message-digest algorithm.
+    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
+
+    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
+    information about the terms and conditions under which the code is
+    supplied.
+
     \section1 MNG Library (\c libmng) version 1.0.10
 
     \e{The libmng library supports decoding, displaying, encoding, and various
@@ -152,6 +172,56 @@
 
     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.
+
+    \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
+    conditions under which the code is supplied.
+
+    \section1 SQLite (\c sqlite) version 3.5.9
+
+    \e{SQLite is a small C library that implements a
+    self-contained, embeddable, zero-configuration SQL database engine.}
+    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
+
+    According to the comments in the source files, the code is in the public
+    domain. See the
+    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
+    SQLite web site for further information.
+
     \section1 TIFF Software Distribution (\c libtiff) version 3.8.2
 
     \e {libtiff is a set of C functions (a library) that support the
@@ -212,17 +282,6 @@
 
     See \c src/3rdparty/libtiff/COPYRIGHT for license details.
 
-    \section1 SQLite (\c sqlite) version 3.5.9
-
-    \e{SQLite is a small C library that implements a
-    self-contained, embeddable, zero-configuration SQL database engine.}
-    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
-
-    According to the comments in the source files, the code is in the public
-    domain. See the
-    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
-    SQLite web site for further information.
-
     \section1 Wintab API (\c wintab)
 
     Wintab is a de facto API for pointing devices on Windows. The
@@ -238,35 +297,4 @@
     src/3rdparty/zlib/README.
 
     See \c src/3rdparty/zlib/README 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.
 */
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 9846ac4..23e8623 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -208,10 +208,10 @@
         <td valign="top">
         <ul>
         <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li>
-        <li><a href="http://www.qtsoftware.com/products/qt/3rdparty/">Partner Add-ons</a></li>
+        <li><a href="http://www.qtsoftware.com/products/appdev">Partner Add-ons</a></li>
         <li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li>
-        <li><a href="http://www.qtsoftware.com/support/">Support</a></li>
-        <li><a href="http://www.qtsoftware.com/support/training/">Training</a></li>
+        <li><a href="http://www.qtsoftware.com/support-services/support-services/">Support</a></li>
+        <li><a href="http://www.qtsoftware.com/support-services/training/">Training</a></li>
         </ul>
         </td>
         <td valign="top">
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 925a195..6a689f9 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -738,8 +738,6 @@ in the \l{Qt for Windows CE Requirements} document.
     \header                                        \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal 
     \row    \o linux-x86-g++ \o GCC 4.2.4          \o 1.7M    \o 2.7M   \o 3.3M    \o 9.9M   \o 653K    \o 1.1M   \o N/A     \o 17M
     \row    \o linux-arm-g++ \o GCC 4.1.1          \o 1.9M    \o 3.2M   \o 4.1M    \o 11M    \o 507K    \o 1.0M   \o N/A     \o 17M
-    \row    \o linux-arm-g++ (thumb)
-                             \o GCC 4.1.1          \o 1.7M    \o 2.8M   \o 4.0M    \o 9.8M   \o 409K    \o 796K   \o N/A     \o 17M
     \row    \o linux-mips-g++ (MIPS32)
                              \o GCC 4.2.4          \o 2.0M    \o 3.2M   \o 4.5M    \o 12M    \o 505K    \o 1003K  \o N/A     \o 21M
     \endtable
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index a57de9d..d9e38ed 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -6,7 +6,7 @@ public:
     {
         qreal penWidth = 1;
         return QRectF(-10 - penWidth / 2, -10 - penWidth / 2,
-                      20 + penWidth / 2, 20 + penWidth / 2);
+                      20 + penWidth, 20 + penWidth);
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp
index 07cedbf..be171c6 100644
--- a/doc/src/snippets/picture/picture.cpp
+++ b/doc/src/snippets/picture/picture.cpp
@@ -66,7 +66,7 @@ int main()
         QPicture picture;
         picture.load("drawing.pic");           // load picture
         QPainter painter;
-        painter.begin(&myWidget);              // paint in myWidget
+        painter.begin(&myImage);               // paint in myImage
         painter.drawPicture(0, 0, picture);    // draw the picture at (0,0)
         painter.end();                         // painting done
 //! [1]