Merge commit 'qt-mainline/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

17 files changed, 250 insertions, 54 deletions

diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc
index 4f4db85..bfd8066 100644
--- a/doc/src/development/designer-manual.qdoc
+++ b/doc/src/development/designer-manual.qdoc
@@ -61,9 +61,6 @@
     \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.6 boasts a long list of improvements. For a detailed list of
-    what is new, refer \l{What's New in Qt Designer 4.6}.
-
     \image designer-multiple-screenshot.png
 
     For more information on using \QD, you can take a look at the following
diff --git a/doc/src/diagrams/programs/standard_views.py b/doc/src/diagrams/programs/standard_views.py
new file mode 100644
index 0000000..f1d69f6
--- /dev/null
+++ b/doc/src/diagrams/programs/standard_views.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+import sys
+from PyQt4.QtCore import QDir, Qt
+from PyQt4.QtGui import *
+
+app = QApplication(sys.argv)
+
+background = QWidget()
+palette = QPalette()
+palette.setColor(QPalette.Window, QColor(Qt.white))
+background.setPalette(palette)
+
+model = QFileSystemModel()
+model.setRootPath(QDir.currentPath())
+
+treeView = QTreeView(background)
+treeView.setModel(model)
+treeView.setRootIndex(model.index(QDir.currentPath()))
+
+listView = QListView(background)
+listView.setModel(model)
+listView.setRootIndex(model.index(QDir.currentPath()))
+
+tableView = QTableView(background)
+tableView.setModel(model)
+tableView.setRootIndex(model.index(QDir.currentPath()))
+
+selection = QItemSelectionModel(model)
+treeView.setSelectionModel(selection)
+listView.setSelectionModel(selection)
+tableView.setSelectionModel(selection)
+
+layout = QHBoxLayout(background)
+layout.addWidget(listView)
+layout.addSpacing(24)
+layout.addWidget(treeView, 1)
+layout.addSpacing(24)
+layout.addWidget(tableView)
+background.show()
+
+sys.exit(app.exec_())
diff --git a/doc/src/frameworks-technologies/statemachine.qdoc b/doc/src/frameworks-technologies/statemachine.qdoc
index 2b137dd..ed8bc85 100644
--- a/doc/src/frameworks-technologies/statemachine.qdoc
+++ b/doc/src/frameworks-technologies/statemachine.qdoc
@@ -304,6 +304,35 @@
   For parallel state groups, the QState::finished() signal is emitted when \e
   all the child states have entered final states.
 
+  \section1 Targetless Transitions
+
+  A transition need not have a target state. A transition without a target can
+  be triggered the same way as any other transition; the difference is that
+  when a targetless transition is triggered, it doesn't cause any state
+  changes. This allows you to react to a signal or event when your machine is
+  in a certain state, without having to leave that state. Example:
+
+  \code
+    QStateMachine machine;
+    QState *s1 = new QState(&machine);
+
+    QPushButton button;
+    QSignalTransition *trans = new QSignalTransition(&button, SIGNAL(clicked()));
+    s1->addTransition(trans);
+
+    QMessageBox msgBox;
+    msgBox.setText("The button was clicked; carry on.");
+    QObject::connect(trans, SIGNAL(triggered()), &msgBox, SLOT(exec()));
+
+    machine.setInitialState(s1);
+  \endcode
+
+  The message box will be displayed each time the button is clicked, but the
+  state machine will remain in its current state (s1). If the target state
+  were explicitly set to s1, however, s1 would be exited and re-entered each
+  time (e.g. the QAbstractState::entered() and QAbstractState::exited()
+  signals would be emitted).
+
   \section1 Events, Transitions and Guards
 
   A QStateMachine runs its own event loop. For signal transitions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 543a2e1..d80308a 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -295,6 +295,8 @@
 
     \o \image animation-examples.png
     \o
+    These examples show to to use the \l{The Animation Framework}{animation framework}
+    to build highly animated, high-performance GUIs.
 
     \row
     \o{2,1} \l{Gestures Examples}{\bold{Gestures}}
@@ -322,6 +324,8 @@
 
     \o \image activeqt-examples.png ActiveQt
     \o
+    These examples demonstrate how to write ActiveX controls and control servers
+    with Qt, and how to use ActiveX controls and COM objects in a Qt application.
 
     \row
     \o{2,1} \l{Qt Quarterly}{\bold{Qt Quarterly}}
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 1a20be9..539c1d5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -599,14 +599,14 @@ If you are using pre-built binaries, follow the instructions
 
     \o  Build Qt
 
-        To build Qt for the device, type:
-
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
-        
         To build Qt for the emulator, type:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 24
 
+        To build Qt for the device, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
+        
         Congratulations, Qt is now ready to use.
 
     \o  Running Qt demos
diff --git a/doc/src/images/gradient.png b/doc/src/images/gradient.png
new file mode 100644
index 0000000..2ef36ed
--- /dev/null
+++ b/doc/src/images/gradient.png
diff --git a/doc/src/images/graphicseffect-bloom.png b/doc/src/images/graphicseffect-bloom.png
new file mode 100644
index 0000000..dace7eb
--- /dev/null
+++ b/doc/src/images/graphicseffect-bloom.png
diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png
index 3709014..609bef9 100644
--- a/doc/src/images/graphicseffect-effects.png
+++ b/doc/src/images/graphicseffect-effects.png
diff --git a/doc/src/images/graphicseffect-plain.png b/doc/src/images/graphicseffect-plain.png
new file mode 100644
index 0000000..8b4c1c4
--- /dev/null
+++ b/doc/src/images/graphicseffect-plain.png
diff --git a/doc/src/images/pbuffers-example.png b/doc/src/images/pbuffers-example.png
index bafb05a..c34a6fd 100644
--- a/doc/src/images/pbuffers-example.png
+++ b/doc/src/images/pbuffers-example.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 480107a..6b81936 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -79,15 +79,15 @@
         </td>
         </tr>
         <tr>
-        <th class="largeheader">
+        <th class="titleheader">
             Fundamentals</th>
-        <th class="largeheader">
+        <th class="titleheader">
             User Interface Design</th>
-        <th class="largeheader">
+        <th class="titleheader">
             Technologies</th>
         </tr>
         <tr>
-        <td valign="top" class="largeindex">
+        <td valign="top">
         <ul>
             <li><a href="object.html">The Qt Object Model</a></li>
             <li><a href="eventsandfilters.html">Event System</a></li>
@@ -96,7 +96,7 @@
             <li><a href="platform-specific.html">Platform Specifics</a></li>
         </ul>
         </td>
-        <td valign="top" class="largeindex">
+        <td valign="top">
         <ul>
             <li><a href="widgets-and-layouts.html">Widgets and Layouts</a></li>
             <li><a href="application-windows.html">Application Windows</a></li>
@@ -106,7 +106,7 @@
             <li><a href="qtdeclarative.html">Declarative UI</a></li>
         </ul>
         </td>
-        <td valign="top" class="largeindex">
+        <td valign="top">
         <ul>
             <li><a href="io.html">Input/Output</a> and <a href="resources.html">Resources</a></li>
             <li><a href="network-programming.html">Network Programming</a></li>
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index d455463..5be66f8 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -411,6 +411,24 @@
 
     For information about mixing exceptions with symbian leaves,
     see \l{Exception Safety with Symbian}
+
+    \section1 Multimedia and Phonon Support
+
+    Qt provides a backend for Qt's multimedia module, Phonon, which supports
+    video and sound playback through Symbian's Multimedia Framework, MMF.
+
+    In this release the support is experimental. Video playback may have
+    flickering issues, and support for effects and playback queueing is
+    incomplete.
+
+    The audio and video formats that Phonon supports depends on what support
+    the platform provides for MMF. The emulator is known to have limited
+    codec support.
+
+    In addition, there exists a backend for the Helix framework. However, due
+    to it not shipping with Qt, its availability depends on the Symbian
+    platform in use. If available, it is loaded instead of the MMF plugin.
+
 */
 
 /*!
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 61bd779..788af67 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -78,7 +78,7 @@
     \row    \o Linux (32 and 64-bit)
                                      \o gcc 4.2
     \row    \o Microsoft Windows XP
-                                     \o gcc 3.4.2 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit)
+                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit)
     \row    \o Microsoft Windows Vista
                                      \o MSVC 2005, 2008
     \row    \o Microsoft Windows Vista 64bit
@@ -104,6 +104,14 @@
     \table
     \header \o Platform
                                      \o Compilers
+    \row    \o Windows XP, Vista
+                                     \o gcc 3.4.2 (MinGW)
+    \omit
+    \row    \o Windows 7
+                                     \o MSVC 2008
+    \endomit
+    \row    \o Apple Mac OS X 10.6 "Snow Leopard"
+                                     \o As provided by Apple
     \row    \o Apple Mac OS X 10.4 "Tiger"
                                      \o As provided by Apple
     \row    \o HPUXi 11.11
@@ -128,7 +136,14 @@
 
     All platforms not specifically listed above are not supported by Nokia. Nokia does
     not run its unit test suite or perform any other internal tests on platforms not
-    listed above.  Qt users should note, however, that there may be various open source
+    listed above.
+
+    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
+    availability of other services for those platforms.
+
+    Qt users should note, however, that there may be various open source
     projects, community users and/or Qt partners who are able to provide assistance with
     platforms not supported by Nokia.
 
diff --git a/doc/src/qt-resources.qdoc b/doc/src/qt-resources.qdoc
new file mode 100644
index 0000000..a7dffe4
--- /dev/null
+++ b/doc/src/qt-resources.qdoc
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** 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 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 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$
+**
+****************************************************************************/
+
+/*!
+    \page qt-resources.html
+    \image gradient.png
+*/
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index e02cd19..7287656 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -145,7 +145,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/contact
+    \externalpage http://qt.nokia.com/about/contact-us
     \title How to Order
 */
 
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 03d9b29..47eab16 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -464,6 +464,7 @@
     previous releases in the Qt 4 series. This document covers the
     most important features in this release, separated by category.
 
+\omit
     A comprehensive list of changes between Qt 4.5 and Qt 4.6 is
     included in the \c changes-4.6.0 file
     \l{http://qt.nokia.com/developer/changes/changes-4.6.0}{available
@@ -473,6 +474,7 @@
     Changes between this release and the previous release are provided
     in the \c{changes-%VERSION%} file (also
     \l{http://qt.nokia.com/developer/changes/changes-%VERSION%}{available online}).
+\endomit
 
     A list of other Qt 4 features can be found on the \bold{\l{What's
     New in Qt 4}} page.
@@ -481,6 +483,14 @@
 
     \tableofcontents
 
+    \section1 Support for Symbian
+
+    Qt 4.6 is the first release to include support for the Symbian
+    platform, with integration into the S60 framework. The port to
+    Symbian and S60 provides all functionality required to develop
+    rich end-user applications for devices running Symbian 3.1 and
+    later.
+
     \section1 Animation Framework
 
     The animation framework helps build highly animated,
@@ -491,8 +501,9 @@
     The framework makes it easy to animate \l{QObject}s, including
     QWidgets, by allowing Qt properties to be animated. It also allows
     creating custom animations and interpolation functions. Graphics
-    views are not left out--one can animate \l{QGraphicsWidget}s,
-    which inherits from QObject (and thereby enables properties).
+    views are not left out; one can animate \l{QGraphicsWidget}s and
+    new \l{QGraphicsObject}s which inherit from QGraphicsItem
+    (and thereby enable properties).
 
     Animations are controlled using easing curves and can be grouped
     together. This enables animations of arbitrary complexity.
@@ -508,6 +519,8 @@
     The state machine framework is introduced in 4.6 and is described
     below.
 
+    See \l{The Animation Framework} documentation for more information.
+
     \section1 State Machine Framework
 
     The state machine framework provides a robust state chart
@@ -533,6 +546,8 @@
     trigger on signals and \l{QEvent}s. By inserting animations into
     the state machine, it is also easier to use the framework for
     animating GUIs, for instance.
+    
+    See \l{The State Machine Framework} documentation for more infromation.
 
     \section1 Multi-touch & Gestures
 
@@ -552,6 +567,8 @@
         \o Enable extensibility.
     \endlist
 
+    See the QTouchEvent and QGesture class documentation for more information.
+
     \section1 DOM access API
 
     Web pages and XML both have very complex document object models.
@@ -566,20 +583,7 @@
         QList<QWebElement> introSpans = document.findAll("p.intro span");
     \endcode
 
-    \section1 Qt3D enablers
-
-    As more of Qt, and more of the applications built on Qt go 3D,
-    API's should be provided to simplify this. Mainly, the new API
-    aims to make it more easy to create 3D applications with OpenGL.
-    It will also unify the Qt OpenGL codebase, and enable
-    cross-platform 3D codebase.
-
-    The main features of the Qt3D enablers are currently: Math
-    primitives for matrix multiplication, vectors, quaternions
-    (client-side), and API for vertex and fragment shaders, GLSL/ES.
-    Future research will, among other things include stencils,
-    scissors, vertex buffers and arrays, texture manipulation, and
-    geometry shaders.
+    See the QWebElement class documentation for more information.
 
     \section1 Performance Optimizations
 
@@ -592,10 +596,57 @@
         \o Reduced overhead in QNetworkAccessManager.
         \o Added the QContiguousCache class, which provides efficient caching of
            contiguous data.
+        \o Added support for hardware-accelerated rendering through
+        \l{OpenVG Rendering in Qt}{OpenVG}
         \o Removed Win9x support.
     \endlist
 
-    \section1 Multimedia Audio Services
+    \section1 Graphics Effects
+
+    Effects can be used to alter the appearance of UI elements such as
+    \l{QGraphicsItem}s and \l{QWidget}s. A range of standard effects such
+    as blurring, colorizing or blooming is provided, and it is possible to
+    implement custom effects.
+
+    \table
+    \row
+    \o
+    \o \img graphicseffect-plain.png
+    \o
+    \row
+    \o \img graphicseffect-blur.png
+    \o \img graphicseffect-colorize.png
+    \o \img graphicseffect-bloom.png
+    \endtable
+
+    See the QGraphicsEffect class documentation for more information.
+
+    \section1 XML Schema Validation
+
+    The QtXmlPatterns module can now be used to validate schemas, either
+    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.
+
+    See the \l{XML Processing} and QXmlSchema class documentation for more
+    information.
+
+    \section1 Qt3D enablers
+
+    As more of Qt, and more of the applications built on Qt go 3D,
+    API's should be provided to simplify this. Mainly, the new API
+    aims to make it more easy to create 3D applications with OpenGL.
+    It will also unify the Qt OpenGL codebase, and enable
+    cross-platform 3D codebase.
+
+    The main features of the Qt3D enablers are currently: Math
+    primitives for matrix multiplication, vectors, quaternions
+    (client-side), and API for vertex and fragment shaders, GLSL/ES.
+    Future research will, among other things include stencils,
+    scissors, vertex buffers and arrays, texture manipulation, and
+    geometry shaders.
+
+    \section1 Multimedia Services
 
     Qt 4.6 comes with new classes for handling audio. These classes
     provide low-level access to the system's audio system. By
@@ -605,21 +656,14 @@
     functions to query audio devices for which audio formats they
     support.
 
-    \section1 Classes and Functions Introduced in 4.6
-
-    Links to class, function, and macro documentation.
-
-    \section2 Classes
-
-    Classes introduced in Qt 4.6.
-
-    \sincelist classes
+    See the \l{QtMultimedia Module} documentation for more information.
 
-    \section2 Functions & Macros
+    \section1 Classes, functions, and other items introduced in 4.6
 
-    Fuctions and macros introduced in Qt 4.6.
+    Links to classes, function, and other items that were added in
+    4.6.
 
-    \sincelist functions
+    \sincelist 4.6
 
 */
 
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 045d740..d0a1976 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -90,7 +90,7 @@
     \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
     \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
     \row \o \c run           \o Run the emulator binaries from the build directory.
-    \row \o \c sis          \o Create signed \c .sis file for project.
+    \row \o \c sis           \o Create signed \c .sis file for project.
     \endtable
 
     The following lines perform a debug build for the emulator
@@ -106,7 +106,7 @@
     To install your own applications on hardware, you need signed \c .sis file.
     The signed \c .sis file can be created with \c make \c sis target. \c sis target
     is only supported for executables or projects with \c DEPLOYMENT statements.
-    By default the \c sis target will create signed \.sis file for last build
+    By default the \c sis target will create signed \c .sis file for last build
     target. For example, the following sequence will generate the needed makefiles, 
     build the project for \c debug-winscw and \c release-armv5, and create 
     self-signed \c .sis file for \c release-armv5 target:
@@ -119,8 +119,10 @@
     
     \table
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
-                                       Currently only -i, install the package right away 
-                                       using PC suite, is supported.
+                                       -i, install the package right away using PC suite.
+                                       -c=<file>, read certificate information from a file.
+                                       Execute \c{perl createpackage.pl} for more information
+                                       about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in 
@@ -133,13 +135,13 @@
                                        By default empty. 
     \endtable    
     
-    The environment variables for \c make can be given as an parameters. For example:
-    
-    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3    
-    
-    The above example is identical to:
+    For example:
     
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4        
+
+    The environment variables for \c make can also be given as parameters:
+    
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3        
     
     If you want to install the program immediately, make sure that the device
     is connected to the computer in "PC Suite" mode, and run \c sis target