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

Conflicts:
	configure.exe
	examples/itemviews/puzzle/puzzle.pro
	examples/qtconcurrent/imagescaling/imagescaling.pro
	examples/widgets/movie/movie.pro
	tools/configure/configureapp.cpp

Will rebuild configure.exe in next commit.

21 files changed, 164 insertions, 147 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/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 03b74e6..4b8de32 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -58,7 +58,8 @@
     and custom plugins allow you to use your own components with \QD.
 
     If you are new to \QD, you can take a look at the
-    \l{Getting To Know Qt Designer} document.
+    \l{Getting To Know Qt Designer} document. For a quick tutorial on how to
+    use \QD, refer to \l{A Quick Start to Qt Designer}.
 
     Qt Designer 4.5 boasts a long list of improvements. For a detailed list of
     what is new, refer \l{What's New in Qt Designer 4.5}.
@@ -235,6 +236,7 @@
     \page designer-to-know.html
     \contentspage {Qt Designer Manual}{Contents}
 
+
     \title Getting to Know Qt Designer
 
     \tableofcontents
@@ -298,12 +300,12 @@
         \row
             \i \inlineimage designer-widget-box.png
             \i \bold{Qt Designer's Widget Box}
-        
+
         The widget box provides a selection of standard Qt widgets, layouts,
         and other objects that can be used to create user interfaces on forms.
         Each of the categories in the widget box contain widgets with similar
         uses or related features.
-        
+
         \note Since Qt 4.4, new widgets have been included, e.g.,
         QPlainTextEdit, QCommandLinkButton, QScrollArea, QMdiArea, and
         QWebView.
@@ -357,7 +359,7 @@
     using a grid. The coordinates on the screenshot show the position of each
     widget within the grid.
 
-    \image addressbook-tutorial-part3-labeled-layout.png    
+    \image addressbook-tutorial-part3-labeled-layout.png
 
     \note Inside the grid, the QPushButton objects are actually nested. The
     buttons on the right are first placed in a QVBoxLayout; the buttons at the
@@ -366,7 +368,7 @@
 
     To visualize, imagine the layout as a box that shrinks as much as possible,
     attempting to \e squeeze your widgets in a neat arrangement, and, at the
-    same time, maximize the use of available space. 
+    same time, maximize the use of available space.
 
     Qt's layouts help when you:
 
@@ -408,6 +410,7 @@
     \page designer-quick-start.html
     \contentspage {Qt Designer Manual}{Contents}
 
+
     \title A Quick Start to Qt Designer
 
     Using \QD involves \bold four basic steps:
@@ -419,16 +422,14 @@
         \o  Preview the form
     \endlist
 
-    \omit
     \image rgbController-screenshot.png
-    \endomit
 
-    Suppose you would like to design a small widget (see screenshot above)
-    that contains the controls needed to manipulate Red, Green and Blue (RGB)
-    values -- a type of widget that can be seen everywhere in image
-    manipulation programs.
+    Suppose you would like to design a small widget (see screenshot above) that
+    contains the controls needed to manipulate Red, Green and Blue (RGB) values
+    -- a type of widget that can be seen everywhere in image manipulation
+    programs.
 
-   \table
+    \table
     \row
     \i \inlineimage designer-choosing-form.png
     \i \bold{Choosing a Form}
@@ -436,39 +437,32 @@
     You start by choosing \gui Widget from the \gui{New Form} dialog.
     \endtable
 
-    Then you drag three labels, three spin boxes and three vertical sliders
-    on to your form. You can roughly arrange them according to how you would
-    like them to be laid out.
 
-    \omit
     \table
-    \row \o \inlineimage rgbController-widgetBox.png
-         \o \inlineimage rgbController-arrangement.png
+    \row
+    \i  \inlineimage rgbController-arrangement.png
+    \i  \bold{Placing Widgets on a Form}
+
+    Drag three labels, three spin boxes and three vertical sliders on to your
+    form. To change the label's default text, simply double-click on it. You
+    can arrange them according to how you would like them to be laid out.
     \endtable
-    \endomit
 
     To ensure that they are laid out exactly like this in your program, you
     need to place these widgets into a layout. We will do this in groups of
-    three. Select the "RED" label. Then, hold down \key Shift while you select
+    three. Select the "RED" label. Then, hold down \key Ctrl while you select
     its corresponding spin box and slider. In the \gui{Form} menu, select
     \gui{Lay Out in a Grid}.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-form-gridLayout.png
             \i \inlineimage rgbController-selectForLayout.png
     \endtable
-    \endomit
 
 
     Repeat the step for the other two labels along with their corresponding
-    spin boxes and sliders as well. Your form will now look similar to the
-    screenshot below.
-
-    \omit
-    \image rgbController-almostLaidOut.png
-    \endomit
+    spin boxes and sliders as well.
 
     The next step is to combine all three layouts into one \bold{main layout}.
     It is important that your form has a main layout; otherwise, the widgets
@@ -476,24 +470,26 @@
     layout, \gui{Right click} anywhere on your form, outside of the three
     separate layouts, and select \gui{Lay Out Horizontally}. Alternatively, you
     could also select \gui{Lay Out in a Grid} -- you will still see the same
-    arrangement.
+    arrangement (shown below).
+
+    \image rgbController-final-layout.png
 
     \note Main layouts cannot be seen on the form. To check if you have a main
     layout installed, try resizing your form; your widgets should resize
     accordingly.
 
     When you click on the slider and drag it to a certain value, you want the
-    spin box to display the slider's position. To do this, you need to connect
-    the slider's \l{QAbstractSlider::}{valueChanged()} signal to the spin box's
-    \l{QSpinBox::}{setValue()} slot. You also need to make the reverse
-    connections, e.g., connect the spin box's \l{QSpinBox::}{valueChanged()}
-    signal to the slider's \l{QAbstractSlider::value()}{setValue()} slot.
+    spin box to display the slider's position. To accomplish this behavior, you
+    need to connect the slider's \l{QAbstractSlider::}{valueChanged()} signal
+    to the spin box's \l{QSpinBox::}{setValue()} slot. You also need to make
+    the reverse connections, e.g., connect the spin box's \l{QSpinBox::}
+    {valueChanged()} signal to the slider's \l{QAbstractSlider::value()}
+    {setValue()} slot.
 
     To do this, you have to switch to \gui{Edit Signals/Slots} mode, either by
     pressing \key{F4} or something \gui{Edit Signals/Slots} from the \gui{Edit}
     menu.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-signalsAndSlots.png
@@ -503,17 +499,19 @@
         \gui{Configure Connection} dialog, shown below, will pop up. Select the
         correct signal and slot and click \gui OK.
     \endtable
-    \endomit
 
-    \omit
-    \image rgbController-configureConnection.png
-    \endomit
+    \image rgbController-configure-connection1.png
 
     Repeat the step (in reverse order), clicking on the spin box and dragging
     the cursor towards the slider, to connect the spin box's
     \l{QSpinBox::}{valueChanged()} signal to the slider's
     \l{QAbstractSlider::value()}{setValue()} slot.
 
+    You can use the screenshot below as a guide to selecting the correct signal
+    and slot.
+
+    \image rgbController-configure-connection2.png
+
     Now that you have successfully connected the objects for the "RED"
     component of the RGB Controller, do the same for the "GREEN" and "BLUE"
     components as well.
@@ -521,7 +519,6 @@
     Since RGB values range between 0 and 255, we need to limit the spin box
     and slider to that particular range.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-property-editing.png
@@ -532,21 +529,14 @@
         \l{QSpinBox::}{maximum} property. Then, click on the first vertical
         slider, you will see \l{QAbstractSlider}'s properties. Enter "255" for
         the \l{QAbstractSlider::}{maximum} property as well. Repeat this
-        process for the remaining spin boxes and sliders.
+        process for the remaining  spin boxes and sliders.
     \endtable
-    \endomit
 
-    Now, we preview your form to see how it would look in your application. To
-    preview your form, press \key{Ctrl + R} or select \gui Preview from the
-    \gui Form menu.
-
-    \omit
-    \image rgbController-preview.png
-    \endomit
-
-    Try dragging the slider - the spin box will mirror its value too (and vice
-    versa). Also, you can resize it to see how the layouts used to manage the
-    child widgets respond to different window sizes.
+    Now, we preview your form to see how it would look in your application -
+    press \key{Ctrl + R} or select \gui Preview from the \gui Form menu. Try
+    dragging the slider - the spin box will mirror its value too (and vice
+    versa). Also, you can resize it to see how the layouts that are used to
+    manage the child widgets, respond to different window sizes.
 */
 
 
@@ -788,11 +778,11 @@
            have a \c text property that can also be edited by double-clicking
            on the widget or by pressing \gui F2. \QD interprets the backslash
            (\\) character specially, enabling newline (\\n) characters to be
-           inserted into the text; the \\\\ character sequence is used to 
+           inserted into the text; the \\\\ character sequence is used to
            insert a single backslash into the text. A context menu can also be
            opened while editing, providing another way to insert special
            characters and newlines into the text.
-    \endlist    
+    \endlist
 
 
     \section2 Dynamic Properties
@@ -804,12 +794,12 @@
 
     \image designer-property-editor-toolbar.png
 
-    To add a dynamic property, clcik on the \gui Add button 
+    To add a dynamic property, clcik on the \gui Add button
     \inlineimage designer-property-editor-add-dynamic.png
-    . To remove it, click on the \gui Remove button 
+    . To remove it, click on the \gui Remove button
     \inlineimage designer-property-editor-remove-dynamic.png
      instead. You can also sort the properties alphabetically and change the
-    color groups by clickinig on the \gui Configure button 
+    color groups by clickinig on the \gui Configure button
     \inlineimage designer-property-editor-configure.png
     .
 
@@ -911,7 +901,7 @@
 
 
     \section2 Horizontal and Vertical Layouts
-    
+
     The simplest way to arrange objects on a form is to place them in a
     horizontal or vertical layout. Horizontal layouts ensure that the widgets
     within are aligned horizontally; vertical layouts ensure that they are
@@ -1138,7 +1128,7 @@
     spacers just provide spacing hints to layouts, so they cannot be connected
     to other objects.
 
-    
+
     \target HighlightedObjects
     \table
         \row
@@ -1177,7 +1167,7 @@
 
     \image designer-connection-dialog.png
 
-    To complete the connection, select a signal from the source object and a 
+    To complete the connection, select a signal from the source object and a
     slot from the destination object, then click \key OK. Click \key Cancel if
     you wish to abandon the connection.
 
@@ -1720,22 +1710,22 @@
             \i  \bold{Resource Files}
 
         Within the resource browser, you can open existing resource files or
-        create new ones. Click the \gui{Edit Resources} button 
+        create new ones. Click the \gui{Edit Resources} button
         \inlineimage designer-edit-resources-button.png
          to edit your resources. To reload resources, click on the \gui Reload
-        button 
+        button
         \inlineimage designer-reload-resources-button.png
         .
     \endtable
 
 
     Once a resource file is loaded, you can create or remove entries in it
-    using the given \gui{Add Files} 
-    \inlineimage designer-add-resource-entry-button.png 
-    and \gui{Remove Files} 
+    using the given \gui{Add Files}
+    \inlineimage designer-add-resource-entry-button.png
+    and \gui{Remove Files}
     \inlineimage designer-remove-resource-entry-button.png
      buttons, and specify resources (e.g., images) using the \gui{Add Files}
-    button 
+    button
     \inlineimage designer-add-files-button.png
     . Note that these resources must reside within the current resource file's
     directory or one of its subdirectories.
@@ -1747,15 +1737,15 @@
             \i  \inlineimage designer-edit-resource.png
             \i  \bold{Editing Resource Files}
 
-        Press the 
+        Press the
         \inlineimage designer-add-resource-entry-button.png
          button to add a new resource entry to the file. Then use the
-        \gui{Add Files} button 
+        \gui{Add Files} button
         \inlineimage designer-add-files-button.png
          to specify the resource.
 
         You can remove resources by selecting the corresponding entry in the
-        resource editor, and pressing the 
+        resource editor, and pressing the
         \inlineimage designer-remove-resource-entry-button.png
          button.
     \endtable
@@ -2563,7 +2553,7 @@ pixmap property in the property editor.
         QDesignerTaskMenuExtension is useful for custom widgets. It provides an
         extension that allows you to add custom menu entries to \QD's task
         menu.
-    
+
         The \l{designer/taskmenuextension}{Task Menu Extension} example
         illustrates how to use this class.
 
@@ -2664,7 +2654,7 @@ pixmap property in the property editor.
     function, making it able to create your extension, such as a
      \l{designer/containerextension}{MultiPageWidget} container extension.
 
-    You can either create a new QExtensionFactory and reimplement the 
+    You can either create a new QExtensionFactory and reimplement the
     QExtensionFactory::createExtension() function:
 
     \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 8
diff --git a/doc/src/emb-fonts.qdoc b/doc/src/emb-fonts.qdoc
index 3ed23c3..86e169d 100644
--- a/doc/src/emb-fonts.qdoc
+++ b/doc/src/emb-fonts.qdoc
@@ -131,7 +131,7 @@
     The Qt Prerendered Font (QPF2) is an architecture-independent,
     light-weight and non-scalable font format specific to \l{Qt for Embedded Linux}.
 
-    Nokia provides the cross-platform \c makeqpf tool, included in the
+    Nokia provides the cross-platform \l makeqpf tool, included in the
     \c tools directory of both \l {Qt} and \l{Qt for Embedded Linux}, which allows
     generation of QPF2 files from system fonts.
 
diff --git a/doc/src/emb-makeqpf.qdoc b/doc/src/emb-makeqpf.qdoc
index ca33eda..8f5d10b 100644
--- a/doc/src/emb-makeqpf.qdoc
+++ b/doc/src/emb-makeqpf.qdoc
@@ -44,7 +44,10 @@
     \title makeqpf
     \ingroup qt-embedded-linux
 
-    \c makeqpf is not part of Qt 4. However, Qt 4 can still read QPF
-    files generated by Qt 2 or 3. To generate QPF files, use makeqpf from Qt 2
-    or 3.
+    \c makeqpf is a tool to generate pre-rendered fonts in QPF2 format for use on Embedded Linux.
+
+    Qt 4 can read files in QPF2 format in addition to QPF files generated by older versions of
+    \c makeqpf from Qt 2 or 3.
+
+    \sa {Qt for Embedded Linux Fonts}
 */
diff --git a/doc/src/images/designer-choosing-form.png b/doc/src/images/designer-choosing-form.png
index fa6e470..bee4b29 100644
--- a/doc/src/images/designer-choosing-form.png
+++ b/doc/src/images/designer-choosing-form.png
diff --git a/doc/src/images/rgbController-arrangement.png b/doc/src/images/rgbController-arrangement.png
new file mode 100644
index 0000000..d9e8bab
--- /dev/null
+++ b/doc/src/images/rgbController-arrangement.png
diff --git a/doc/src/images/rgbController-configure-connection1.png b/doc/src/images/rgbController-configure-connection1.png
new file mode 100644
index 0000000..4e5dcf2
--- /dev/null
+++ b/doc/src/images/rgbController-configure-connection1.png
diff --git a/doc/src/images/rgbController-configure-connection2.png b/doc/src/images/rgbController-configure-connection2.png
new file mode 100644
index 0000000..f3fcc62
--- /dev/null
+++ b/doc/src/images/rgbController-configure-connection2.png
diff --git a/doc/src/images/rgbController-final-layout.png b/doc/src/images/rgbController-final-layout.png
new file mode 100644
index 0000000..d32a93e
--- /dev/null
+++ b/doc/src/images/rgbController-final-layout.png
diff --git a/doc/src/images/rgbController-form-gridLayout.png b/doc/src/images/rgbController-form-gridLayout.png
new file mode 100644
index 0000000..c8f3dcf
--- /dev/null
+++ b/doc/src/images/rgbController-form-gridLayout.png
diff --git a/doc/src/images/rgbController-property-editing.png b/doc/src/images/rgbController-property-editing.png
new file mode 100644
index 0000000..64fc500
--- /dev/null
+++ b/doc/src/images/rgbController-property-editing.png
diff --git a/doc/src/images/rgbController-screenshot.png b/doc/src/images/rgbController-screenshot.png
new file mode 100644
index 0000000..6019233
--- /dev/null
+++ b/doc/src/images/rgbController-screenshot.png
diff --git a/doc/src/images/rgbController-selectForLayout.png b/doc/src/images/rgbController-selectForLayout.png
new file mode 100644
index 0000000..7a8e184
--- /dev/null
+++ b/doc/src/images/rgbController-selectForLayout.png
diff --git a/doc/src/images/rgbController-signalsAndSlots.png b/doc/src/images/rgbController-signalsAndSlots.png
new file mode 100644
index 0000000..2ba3aba
--- /dev/null
+++ b/doc/src/images/rgbController-signalsAndSlots.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 4ead9e4..23e8623 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -153,6 +153,7 @@
         <li><a href="overviews.html">All Overviews and HOWTOs</a></li>
         <li><a href="gallery.html">Qt Widget Gallery</a></li>
         <li><a href="http://doc.trolltech.com/extras/qt43-class-chart.pdf">Class Chart</a></li>
+        <li><a href="qtglobal.html">Qt Global Declarations</a></li>
         </ul>
         </td>
         <td valign="top">
@@ -207,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 3270dae..319420b 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -921,8 +921,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/qset.qdoc b/doc/src/qset.qdoc
index afbedc3..6326219 100644
--- a/doc/src/qset.qdoc
+++ b/doc/src/qset.qdoc
@@ -685,11 +685,12 @@
 */
 
 /*!
-    \typedef QSet::iterator::iterator_category
-    \typedef QSet::const_iterator::iterator_category
+  \typedef QSet::iterator::iterator_category
+  \typedef QSet::const_iterator::iterator_category
 
-    \internal
-*/
+  Synonyms for \e {std::bidirectional_iterator_tag} indicating
+  these iterators are bidirectional iterators.
+ */
 
 /*!
     \typedef QSet::iterator::difference_type
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]
diff --git a/doc/src/tools-list.qdoc b/doc/src/tools-list.qdoc
index 7af9936..caef268 100644
--- a/doc/src/tools-list.qdoc
+++ b/doc/src/tools-list.qdoc
@@ -58,12 +58,10 @@
          \o Translate applications to reach international markets.
     \row \o \l{qmake Manual}{qmake}
          \o Create makefiles from simple platform-independent project files (\c .pro files).
-    \omit
-    \row \o \l{emb-qvfb.html}{qvfb}
+    \row \o \l{The Virtual Framebuffer}{qvfb}
          \o Run and test embedded applications on the desktop.
-    \row \o \l{emb-makeqpf.html}{makeqpf}
+    \row \o \l{makeqpf}
          \o Create pre-rendered fonts for embedded devices.
-    \endomit
     \row \o \l{moc}{Meta-Object Compiler (moc)}
          \o Generate meta-object information for QObject subclasses.
     \row \o \l{User Interface Compiler (uic)}
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 301f0d4..6ef3a89 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -286,11 +286,9 @@ including ARM, Intel x86, MIPS and SH-4.
     \o \l {Qt for Windows CE Requirements}
     \o \l {Installing Qt on Windows CE}
     \o \l {Windows CE - Introduction to using Qt}{Introduction to using Qt}
-    \o \l {Qt Examples#Qt for Embedded Linux}{Examples}
 \endlist
 \o
 \list
-    \o \l {Qt for Embedded Linux Classes}{Classes}
     \o \l {Windows CE - Using shadow builds}{Using shadow builds}
     \o \l {Windows CE - Working with Custom SDKs}{Working with Custom SDKs}
 \endlist