Merge commit 'origin/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

4 files changed, 57 insertions, 12 deletions

diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc
index bdadcf7..65b6baa 100644
--- a/doc/src/development/designer-manual.qdoc
+++ b/doc/src/development/designer-manual.qdoc
@@ -1569,12 +1569,11 @@
     \raw HTML
     </div>
     \endraw
-    \table
 
     \section2 Creating a Menu Entry
 
-    Double-click the \gui{new action} placeholder to begin editing, or
-    double-click \gui{new separator} to insert a new separator line after
+    Double-click the \gui{Type Here} placeholder to begin editing, or
+    double-click \gui{Add Separator} to insert a new separator line after
     the last entry in the menu.
 
     The menu entry's text is displayed using a line edit, and can be
@@ -1630,7 +1629,6 @@
     Since actions can be represented by menu entries and toolbar buttons,
     they can be moved between menus and toolbars.
 
-    \target AddingAnAction
     \raw HTML
     <div style="float: right; margin-left: 2em">
     \endraw
@@ -1745,13 +1743,19 @@
 
     \section2 Adding a Dock Widget
 
-    To add a dock widget, simply drag one from the \gui Containers section
-    of the widget box, and drop it onto the main form area. Just like other
-    widgets, its properties can be modified with the \gui{Property Editor}.
+    To add a dock widget to a form, drag one from the \gui Containers section
+    of the widget box, and drop it onto the main form area. Do not add the
+    dock widget to an existing layout. Instead, open the \gui{Property Editor}
+    and enable the \gui{docked} property to place it in a dock area.
+
+    Note that it is sometimes easier to configure a dock widget if it is added
+    to a form before a layout is applied to the central widget. For example,
+    it is possible to undock it and resize it, making it more convenient to
+    add child widgets.
 
-    Dock widgets can be optionally floated as indpendent tool windows.
+    Dock widgets can be optionally floated as independent tool windows.
     Hence, it is useful to give them window titles by setting their
-    \gui{windowTitle} property. This also helps to identify them on the
+    \l{QDockWidget::}{windowTitle} property. This also helps to identify them on the
     form.
 
     \raw HTML
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index b9b7771..1e3cc47 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -44,7 +44,8 @@
     \startpage index.html Qt Reference Documentation
 
     \title Gestures Programming
-    \ingroup howto
+    \ingroup frameworks-technologies
+
     \brief An overview of the Qt support for Gesture programming.
 
     Qt includes a framework for gesture programming that gives has the ability
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 1ed1b30..9e72ab4 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -300,7 +300,7 @@
     \o{2,1} \l{Gestures Examples}{\bold{Gestures}}
     \o{2,1} \l{D-Bus Examples}{\bold{D-Bus}}
     \row
-    \o \image gestures-examples.png
+    \o \image gestures.png
     \o
     Applications can be written to respond to gestures as a natural input method.
     These examples show how to enable support for standard and custom gestures in
@@ -1074,7 +1074,7 @@
     \nextpage D-Bus Examples
 
     \list
-    \o \l{gestures/imageviewer}{Image Viewer}
+    \o \l{widgets/imageviewer}{Image Viewer}
     \endlist
 */
 
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index a215d43..e663115 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include <QtGui>