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

Conflicts:
	configure

7 files changed, 50 insertions, 4 deletions

diff --git a/doc/src/diagrams/programs/standard_views.py b/doc/src/diagrams/programs/standard_views.py
index f1d69f6..5581387 100644
--- a/doc/src/diagrams/programs/standard_views.py
+++ b/doc/src/diagrams/programs/standard_views.py
@@ -1,4 +1,44 @@
 #!/usr/bin/env python
+#############################################################################
+##
+## 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$
+##
+#############################################################################
 
 import sys
 from PyQt4.QtCore import QDir, Qt
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 1e3cc47..158a273 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -102,8 +102,6 @@
 
     \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot start
 
-    \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot finish
-
     Here, we examine the direction in which the user swiped the widget and modify
     its contents accordingly.
 
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index d80308a..30dae88 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -1077,9 +1077,13 @@
     \contentspage Qt Examples
     \nextpage D-Bus Examples
 
+    The API of the gesture framework is not yet finalized and
+    still subject to change.
+\omit
     \list
     \o \l{widgets/imageviewer}{Image Viewer}
     \endlist
+\endomit
 */
 
 /*!
diff --git a/doc/src/images/xml-schema.png b/doc/src/images/xml-schema.png
new file mode 100644
index 0000000..b1bcecc
--- /dev/null
+++ b/doc/src/images/xml-schema.png
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 788af67..65d335b 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -140,7 +140,7 @@
 
     Even though some Tier 3 platforms are available under the Qt Commercial License,
     technical support is not included in that license.
-    However, \l{Hot to Order}{contact our sales team} to find out about the
+    However, \l{How to Order}{contact our sales team} to find out about the
     availability of other services for those platforms.
 
     Qt users should note, however, that there may be various open source
diff --git a/doc/src/qt-resources.qdoc b/doc/src/qt-resources.qdoc
index a7dffe4..3b31660 100644
--- a/doc/src/qt-resources.qdoc
+++ b/doc/src/qt-resources.qdoc
@@ -41,5 +41,6 @@
 
 /*!
     \page qt-resources.html
+    \title Not Used
     \image gradient.png
 */
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 47eab16..6224cd4 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -567,7 +567,8 @@
         \o Enable extensibility.
     \endlist
 
-    See the QTouchEvent and QGesture class documentation for more information.
+    See the QTouchEvent class documentation for more information. The
+    Gesture framework API is still subject to change.
 
     \section1 DOM access API
 
@@ -627,6 +628,8 @@
     through C++ APIs in the Qt application, or using the xmlpatternsvalidator
     command line utility. The implementation of XML Schema Validation supports
     the specification version 1.0 in large parts.
+    
+    \img xml-schema.png
 
     See the \l{XML Processing} and QXmlSchema class documentation for more
     information.