Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	mkspecs/features/qt.prf
	src/corelib/animation/qanimationgroup.cpp
	src/corelib/animation/qparallelanimationgroup.cpp
	src/corelib/animation/qpauseanimation.cpp
	src/corelib/animation/qpropertyanimation.cpp
	src/corelib/animation/qsequentialanimationgroup.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qeasingcurve.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/opengl/opengl.pro
	src/opengl/qgl_x11egl.cpp
	tests/auto/auto.pro

38 files changed, 349 insertions, 92 deletions

diff --git a/doc/src/animation.qdoc b/doc/src/animation.qdoc
index 7a4e778..5675185 100644
--- a/doc/src/animation.qdoc
+++ b/doc/src/animation.qdoc
@@ -271,10 +271,10 @@
 
     \code
         QPushButton *bonnie = new QPushButton("Bonnie");
-        bonnie.show();
+        bonnie->show();
 
         QPushButton *clyde = new QPushButton("Clyde");
-        clyde.show();
+        clyde->show();
 
         QPropertyAnimation *anim1 = new QPropertyAnimation(bonnie, "geometry");
         // Set up anim1
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 2706182..8d3ae71 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -235,6 +235,7 @@
     \page designer-to-know.html
     \contentspage {Qt Designer Manual}{Contents}
 
+
     \title Getting to Know Qt Designer
 
     \tableofcontents
@@ -298,12 +299,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 +358,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 +367,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 +409,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 +421,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 +436,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 +469,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 +498,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-configureConnection1.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 +518,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,17 +528,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
@@ -788,11 +781,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 +797,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 +904,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 +1131,7 @@
     spacers just provide spacing hints to layouts, so they cannot be connected
     to other objects.
 
-    
+
     \target HighlightedObjects
     \table
         \row
@@ -1177,7 +1170,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 +1713,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 +1740,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
@@ -2657,7 +2650,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.
 
@@ -2758,7 +2751,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/examples.qdoc b/doc/src/examples.qdoc
index 6603390..c55d29f 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -86,6 +86,12 @@
     \o \l{activeqt/webbrowser}{Web Browser}\raisedaster
     \o \l{activeqt/wrapper}{Wrapper}\raisedaster
     \endlist
+    
+    \section1 Animation
+
+    \list
+    \o \l{animation/stickman}{Stick man}\raisedaster
+    \endlist
 
     \section1 Concurrent Programming
 
diff --git a/doc/src/examples/stickman.qdoc b/doc/src/examples/stickman.qdoc
new file mode 100644
index 0000000..49f4953
--- /dev/null
+++ b/doc/src/examples/stickman.qdoc
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example animation/stickman
+    \title Stickman Example
+
+    The Stickman example shows how to animate transitions in a state machine to implement key frame 
+    animations.
+
+    \image stickman-example.png
+    
+    In this example, we will write a small application which animates the joints in a skeleton and
+    projects a stickman figure on top. The stickman can be either "alive" or "dead", and when in the
+    "alive" state, he can be performing different actions defined by key frame animations. 
+    
+    Animations are implemented as composite states. Each child state of the animation state 
+    represents a frame in the animation by setting the position of each joint in the stickman's 
+    skeleton to the positions defined for the particular frame. The frames are then bound together 
+    with animated transitions that trigger on the source state's polished() signal. Thus, the 
+    machine will enter the state representing the next frame in the animation immediately after it
+    has finished animating into the previous frame.
+    
+    \image stickman-example1.png
+        
+    The states for an animation is constructed by reading a custom animation file format and 
+    creating states that assign values to the the "position" properties of each of the nodes in the 
+    skeleton graph. 
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 1
+    
+    The states are then bound together with signal transitions that listen to the polished() signal.
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 2
+    
+    The last frame state is given a transition to the first one, so that the animation will loop
+    until it is interrupted when a transition out from the animation state is taken. To get smooth 
+    animations between the different key frames, we set a default animation on the state machine. 
+    This is a parallel animation group which contains animations for all the "position" properties 
+    and will be selected by default when taking any transition that leads into a state that assigns 
+    values to these properties.
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 3
+    
+    Several such animation states are constructed, and are placed together as children of a top 
+    level "alive" state which represents the stickman life cycle. Transitions go from the parent
+    state to the child state to ensure that each of the child states inherit them. 
+    
+    \image stickman-example2.png
+    
+    This saves us the effort of connect every state to every state with identical transitions. The 
+    state machine  makes sure that transitions between the key frame animations are also smooth by 
+    applying the default animation when interrupting one and starting another.
+        
+    Finally, there is a transition out from the "alive" state and into the "dead" state. This is 
+    a custom transition type called LightningSrikesTransition which samples every second and 
+    triggers at random (one out of fifty times on average.) 
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 4
+    
+    When it triggers, the machine will first enter a "lightningBlink" state which uses a timer to 
+    pause for a brief period of time while the background color of the scene is white. This gives us 
+    a flash effect when the lightning strikes.
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 5
+    
+    We start and stop a QTimer object when entering and exiting the state. Then we transition into
+    the "dead" state when the timer times out.
+    
+    \snippet examples/animation/stickman/lifecycle.cpp 0
+    
+    When the machine is in the "dead" state, it will be unresponsive. This is because the "dead" 
+    state has no transitions leading out.
+    
+    \image stickman-example3.png
+    
+*/
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/inputdialogs.png b/doc/src/images/inputdialogs.png
index 135c2f6..8bda185 100644
--- a/doc/src/images/inputdialogs.png
+++ b/doc/src/images/inputdialogs.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..0798184
--- /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/images/stickman-example.png b/doc/src/images/stickman-example.png
new file mode 100644
index 0000000..a40f37b
--- /dev/null
+++ b/doc/src/images/stickman-example.png
diff --git a/doc/src/images/stickman-example1.png b/doc/src/images/stickman-example1.png
new file mode 100644
index 0000000..1596a68
--- /dev/null
+++ b/doc/src/images/stickman-example1.png
diff --git a/doc/src/images/stickman-example2.png b/doc/src/images/stickman-example2.png
new file mode 100644
index 0000000..980276a
--- /dev/null
+++ b/doc/src/images/stickman-example2.png
diff --git a/doc/src/images/stickman-example3.png b/doc/src/images/stickman-example3.png
new file mode 100644
index 0000000..3635ff7
--- /dev/null
+++ b/doc/src/images/stickman-example3.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index f0debdb..2d64dfe 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">
@@ -208,10 +209,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/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index dd37fe2..5deb64e 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -1032,6 +1032,7 @@
     \value Stream The MediaSource object describes a data stream.
                   This is the type used for \l{QIODevice}s. Note
                   that a stream opened with a QUrl, will still be of the Url type.
+    \value Empty The media source doesn't have a source.
 
     \sa MediaSource::type()
 */
@@ -2026,6 +2027,15 @@
 */
 
 /*!
+    \fn void Phonon::MediaObject::clear()
+
+    Stops and removes all playing and enqueued media sources.
+
+    \sa setCurrentSource()
+*/
+
+
+/*!
     \fn void Phonon::MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstate)
 
     This signal is emitted when the state of the MediaObject has changed.
@@ -3027,6 +3037,12 @@
 */
 
 /*!
+   \typedef Phonon::AudioOutputInterface
+   \inmodule Phonon
+   \internal
+*/
+
+/*!
     \class Phonon::AudioOutputInterface40
     \inmodule Phonon
     \since 4.4
@@ -3251,7 +3267,19 @@
 /*!
     \fn bool Phonon::Path::operator!=(const Path &p) const;
 
-    Returns true if this Path is not equal to \a p; otherwise returns false;
+    Returns true if this Path is not equal to \a p; otherwise returns false.
+*/
+
+/*!
+    \fn MediaNode *Phonon::Path::source() const;
+
+    Returns the source MediaNode used by the path.
+*/
+
+/*!
+    \fn MediaNode *Phonon::Path::sink() const;
+
+    Returns the sink MediaNode used by the path.
 */
 
 /*!
@@ -4878,7 +4906,7 @@
 */
 
 /*!
-    \typedef typedef void (*CleanUpFunction)()
+    \typedef Phonon::CleanUpFunction
     \inmodule Phonon
     \internal
 */
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 65f9b5d..b66ebee 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -528,6 +528,10 @@
                              Qt::DirectConnection; otherwise the
                              signal is queued, as with
                              Qt::QueuedConnection.
+    \value UniqueConnection  Same as AutoConnection, but there will be a check that the signal is
+                             not already connected to the same slot before connecting, otherwise,
+                             the connection will fail.
+                             \since 4.6
 
     With queued connections, the parameters must be of types that are known to
     Qt's meta-object system, because Qt needs to copy the arguments to store them
diff --git a/doc/src/qset.qdoc b/doc/src/qset.qdoc
index 2d12661..a168800 100644
--- a/doc/src/qset.qdoc
+++ b/doc/src/qset.qdoc
@@ -695,11 +695,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/signalsandslots.qdoc b/doc/src/signalsandslots.qdoc
index 5432bd4..29c8215 100644
--- a/doc/src/signalsandslots.qdoc
+++ b/doc/src/signalsandslots.qdoc
@@ -178,9 +178,13 @@
     looping in the case of cyclic connections (e.g., if
     \c{b.valueChanged()} were connected to \c{a.setValue()}).
 
-    A signal is emitted for every connection you make; if you
-    duplicate a connection, two signals will be emitted. You can
-    always break a connection using QObject::disconnect().
+    By default, for every connection you make, a signal is emitted;
+    two signals are emitted for duplicate connections. You can break
+    all of these connections with a single disconnect() call.
+    If you pass the Qt::UniqueConnection \a type, the connection will only
+    be made if it is not a duplicate. If there is already a duplicate
+    (exact same signal to the exact same slot on the same objects),
+    the connection will fail and connect will return false
 
     This example illustrates that objects can work together without needing to
     know any information about each other. To enable this, the objects only
@@ -218,8 +222,8 @@
     will continue immediately, and the slots will be executed later.
 
     If several slots are connected to one signal, the slots will be
-    executed one after the other, in an arbitrary order, when the signal
-    is emitted.
+    executed one after the other, in the order they have been connected,
+    when the signal is emitted.
 
     Signals are automatically generated by the \l moc and must not be
     implemented in the \c .cpp file. They can never have return types
diff --git a/doc/src/snippets/animation/sequential/icons.qrc b/doc/src/snippets/animation/sequential/icons.qrc
new file mode 100644
index 0000000..d55f797
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+    <file>icons/left.png</file>
+    <file>icons/right.png</file>
+ </qresource>
+</RCC>
diff --git a/doc/src/snippets/animation/sequential/icons/left.png b/doc/src/snippets/animation/sequential/icons/left.png
new file mode 100644
index 0000000..5dd8da0
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons/left.png
diff --git a/doc/src/snippets/animation/sequential/icons/right.png b/doc/src/snippets/animation/sequential/icons/right.png
new file mode 100644
index 0000000..ac61326
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/icons/right.png
diff --git a/doc/src/snippets/animation/sequential/main.cpp b/doc/src/snippets/animation/sequential/main.cpp
new file mode 100644
index 0000000..aff8f29
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/main.cpp
@@ -0,0 +1,50 @@
+#include <QApplication>
+#include <QLabel>
+#include <QPropertyAnimation>
+#include <QSequentialAnimationGroup>
+#include "tracer.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget window;
+    window.resize(720, 96);
+    window.show();
+
+    QLabel *label1 = new QLabel(&window);
+    label1->setPixmap(QPixmap(":/icons/left.png"));
+    label1->move(16, 16);
+    label1->show();
+
+    QLabel *label2 = new QLabel(&window);
+    label2->setPixmap(QPixmap(":/icons/right.png"));
+    label2->move(320, 16);
+    label2->show();
+
+    QPropertyAnimation *anim1 = new QPropertyAnimation(label1, "pos");
+    anim1->setDuration(2500);
+    anim1->setStartValue(QPoint(16, 16));
+    anim1->setEndValue(QPoint(320, 16));
+
+    QPropertyAnimation *anim2 = new QPropertyAnimation(label2, "pos");
+    anim2->setDuration(2500);
+    anim2->setStartValue(QPoint(320, 16));
+    anim2->setEndValue(QPoint(640, 16));
+
+    QSequentialAnimationGroup group;
+    group.addAnimation(anim1);
+    group.addAnimation(anim2);
+
+    Tracer tracer(&window);
+
+    QObject::connect(anim1, SIGNAL(valueChanged(QVariant)),
+                     &tracer, SLOT(recordValue(QVariant)));
+    QObject::connect(anim2, SIGNAL(valueChanged(QVariant)),
+                     &tracer, SLOT(recordValue(QVariant)));
+    QObject::connect(anim1, SIGNAL(finished()), &tracer, SLOT(checkValue()));
+    QObject::connect(anim2, SIGNAL(finished()), &tracer, SLOT(checkValue()));
+
+    group.start();
+    return app.exec();
+}
diff --git a/doc/src/snippets/animation/sequential/sequential.pro b/doc/src/snippets/animation/sequential/sequential.pro
new file mode 100644
index 0000000..fcf017f
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/sequential.pro
@@ -0,0 +1,4 @@
+HEADERS   = tracer.h
+RESOURCES = icons.qrc
+SOURCES   = main.cpp \
+            tracer.cpp
diff --git a/doc/src/snippets/animation/sequential/tracer.cpp b/doc/src/snippets/animation/sequential/tracer.cpp
new file mode 100644
index 0000000..49bd51e
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/tracer.cpp
@@ -0,0 +1,25 @@
+#include <QAbstractAnimation>
+#include <QDebug>
+#include <QPoint>
+#include "tracer.h"
+
+Tracer::Tracer(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void Tracer::checkValue()
+{
+    QAbstractAnimation *animation = static_cast<QAbstractAnimation *>(sender());
+    if (time != animation->duration()) {
+        qDebug() << "Animation's last recorded time" << time;
+        qDebug() << "Expected" << animation->duration();
+    }
+}
+
+void Tracer::recordValue(const QVariant &value)
+{
+    QAbstractAnimation *animation = static_cast<QAbstractAnimation *>(sender());
+    this->value = value;
+    time = animation->currentTime();
+}
diff --git a/doc/src/snippets/animation/sequential/tracer.h b/doc/src/snippets/animation/sequential/tracer.h
new file mode 100644
index 0000000..1adb018
--- /dev/null
+++ b/doc/src/snippets/animation/sequential/tracer.h
@@ -0,0 +1,23 @@
+#ifndef TRACER_H
+#define TRACER_H
+
+#include <QObject>
+#include <QVariant>
+
+class Tracer : public QObject
+{
+    Q_OBJECT
+
+public:
+    Tracer(QObject *parent = 0);
+
+public slots:
+    void checkValue();
+    void recordValue(const QVariant &value);
+
+private:
+    QVariant value;
+    int time;
+};
+
+#endif
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 33bf21a..4cc6617 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -293,11 +293,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