Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

5 files changed, 56 insertions, 28 deletions

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/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/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 5f72ce3..f03f758 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,8 @@
     \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
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 03d9b29..be4cb48 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.
@@ -508,6 +510,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 +537,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 +558,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 +574,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 +587,48 @@
         \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.
+
+    \img graphicseffect-widget.png
+
+    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 +638,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
 
 */