Merge branch '4.6'

Conflicts:
	doc/src/modules.qdoc
	examples/assistant/simpletextviewer/findfiledialog.cpp
	examples/webkit/fancybrowser/mainwindow.cpp
	src/gui/widgets/qtabbar.cpp
	src/gui/widgets/qtabbar_p.h
	tests/auto/qpixmap/tst_qpixmap.cpp
	tools/assistant/compat/helpdialog.cpp
	tools/assistant/compat/tabbedbrowser.cpp
	translations/translations.pri

2 files changed, 139 insertions, 83 deletions

diff --git a/dist/README b/dist/README
index 529d2bd..e7dfb19 100644
--- a/dist/README
+++ b/dist/README
@@ -52,7 +52,7 @@ documentation is available at http://qt.nokia.com/doc/.
 SUPPORTED PLATFORMS
 
 For a complete list of supported platforms, see
-http://qt.nokia.com/doc/%VERSION%/supported-platforms.html.
+http://qt.nokia.com/doc/%SHORTVERSION%/supported-platforms.html.
 
 
 COMMERCIAL EDITIONS
@@ -65,7 +65,7 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
 Qt3Support modules.
 
 For a full listing of the contents of each module, please refer to 
-http://qt.nokia.com/doc/%VERSION%/modules.html
+http://qt.nokia.com/doc/%SHORTVERSION%/modules.html
 
 
 HOW TO REPORT A BUG
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 7c97aa5..887c96f 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -15,22 +15,24 @@ Qt Bug Tracker: http://bugreports.qt.nokia.com
 Task Tracker: http://qt.nokia.com/developer/task-tracker
 Merge Request: http://qt.gitorious.org
 
-QTBUG-1234 - Qt Bug Tracker: http://bugreports.qt.nokia.com
-MR#1234    - Merge Request: http://qt.gitorious.org
-123456     - Task Tracker: http://qt.nokia.com/developer/task-tracker
-
 ****************************************************************************
 *                           General                                        *
 ****************************************************************************
 
- - QtDBus
-   * The minimum required version of the D-Bus reference library is
-     now 0.93.
-   * Support for reading and writing of custom property types added.
-   * Support for getting return arguments in remote method invocation
-     via QMetaMethod::invokeMethod.
+New features
+------------
 
- - [MR#1742] Added new multimedia keys to the Qt::Key enum.
+ - QState, QStateMachine
+    * New classes for state machine framework added to QtCore.
+
+ - QAbstractAnimation
+    * New animation framework added to QtCore
+
+ - QTouchEvent
+    * New class for handling multitouch events added to QtGui
+
+ - QGesture, QGestureRecognizer
+    * New gesture framework added to QtGui
 
  - QMatrix4x4, QGenericMatrix, QVector2D, QVector3D, QVector4D, QQuaternion
     * New classes to support 3D applications.
@@ -41,7 +43,14 @@ MR#1234    - Merge Request: http://qt.gitorious.org
  - QGraphicsEffect
     * New classes for applying graphics effects to graphics items and widgets.
 
- - Boxes demo ported to use new 3D math and shader program classes.
+ - QWebElement
+    * New class for DOM access added to QtWebKit
+
+ - QAudioInput, QAudioOutput
+    * New audio input and output classes.
+
+ - QAbstractVideoSurface, QVideoFrame
+    * New abstract video output classes.
 
  - OpenVG graphics system added.
 
@@ -49,28 +58,31 @@ MR#1234    - Merge Request: http://qt.gitorious.org
 
  - Improved support for input methods in graphics view.
 
- - QAudioInput, QAudioOutput
-    * New audio input and output classes.
-
- - QAbstractVideoSurface, QVideoFrame
-    * New abstract video output classes.
+ - [MR#1742] Added new multimedia keys to the Qt::Key enum.
 
- - New state machine framework added to QtCore.
+ - Boxes demo ported to use new 3D math and shader program classes.
 
  - QtTest now supports outputting XUnit XML documents, for integrating
    with existing continuous integration systems. This is enabled by
    running the test program with the -xunitxml option.
 
-Third party components
-----------------------
+ - QtDBus
+   * The minimum required version of the D-Bus reference library is
+     now 0.93.
+   * Support for reading and writing of custom property types added.
+   * Support for getting return arguments in remote method invocation
+     via QMetaMethod::invokeMethod.
 
- - Updated FreeType to version 2.3.9.
+ - The QtScript module is now based on the 3rdparty JavaScriptCore library. It
+   is only available under the LGPL or a compatible license.
 
- - Updated harfbuzz to the latest version from fd.org.
+Optimizations
+-------------
 
- - Updated sqlite to version 3.6.19.
+ - Optimized rendering strategy in QGraphicsView
+    * See list of Important Behavior Changes below
 
- - Updated libpng to version 1.2.40
+ - Improved delivery of posted events on Windows
 
 
 ****************************************************************************
@@ -78,6 +90,7 @@ Third party components
 ****************************************************************************
 
 QtCore
+------
 
  - QByteArray
     * New overloads for QByteArray::insert() and QByteArray::prepend().
@@ -174,6 +187,7 @@ QtCore
     * [256468] Fixed comment indentation.
 
 QtGui
+-----
 
  - Qt::escape
     * Now escape the double quote (").
@@ -439,6 +453,7 @@ QtGui
       with Qt::WA_NoSystemBackground and window opacity set.
 
 QtDBus
+------
 
  - QDBusConnection
     * Made sending of invalid/incomplete messages consistently fail with error
@@ -451,6 +466,7 @@ QtDBus
       deleted or to change owners.
 
 QtNetwork
+---------
 
  - QAbstractSocket
     * Only disconnect from host when all bytes have been written.
@@ -487,6 +503,7 @@ QtNetwork
       cases the connection stalled when a buffer limit was used.
 
 QtOpenGL
+--------
 
  - QGLColormap
     * setEntry() was inserting entries instead of replacing them.
@@ -535,6 +552,7 @@ QtOpenGL
  - Added lots of OpenGL autotests.
 
 QtScript
+--------
 
  - Many optimizations.
  - Improved ECMA script compliance.
@@ -542,6 +560,7 @@ QtScript
    to a QtScript array index.
 
 QtSql
+-----
 
  - [QTBUG-3162] Views for Sql table models should not reset state on failed
    queries.
@@ -575,6 +594,7 @@ QtSql
  - Add proper iODBC linking support.
 
 QtSvg
+-----
 
  - QSvgHandler
    * [245602] [204686] Fixed gradient and solid-color referencing.
@@ -586,6 +606,7 @@ QtSvg
    * [257052] Changed drawImage() to ignore aspect ratio.
 
 QtWebKit
+--------
 
  - Many bug fixes.
 
@@ -612,33 +633,49 @@ QtWebKit
    * New functions for defining local URL schemes.
 
  - QWebSettings
-   * New options for text encoding, printing shrink factor and off-line web
-     application cache (HTML5).
+   * New options for text encoding and off-line web application cache (HTML5).
 
  - QWebView
    * Support for render hints.
 
 QtXml
+-----
 
  - QDomDocument
     * Set the codec to UTF-8 if codec not present or unknown.
 
 QtXmlPatterns
+-------------
 
  - QXmlQuery
     * [245219] Added QXmlQuery::setFocus(const QString &focus).
 
 Qt Plugins
+----------
 
  - Tiff plugin
     * [258526] Rotate the image if the tiff file contains an orientation tag.
     * [254317] Add support for mono and indexed format
 
+Third party components
+----------------------
+
+ - Updated FreeType to version 2.3.9.
+
+ - Updated harfbuzz to the latest version from fd.org.
+
+ - Updated sqlite to version 3.6.19.
+
+ - Updated libpng to version 1.2.40
+
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
 ****************************************************************************
 
+ - Added support for the Symbian platform with integration for the S60
+   framework.
+
  - Added community supported Qt ports for QNX and VxWorks. See platform
    notes in the Qt documentation for details.
 
@@ -821,6 +858,19 @@ Qt for Embedded Linux
 
  - Compilation fixes for OpenGL/ES 1.0 and OpenGL/ES 1.1 Common Lite.
 
+ - Phonon on Windows
+   * Now much more reliable when reading a file through a QIODevice.
+   * If Video Mixing Renderer 9 is not available, falls back to software 
+     rendering.
+   * Fixed a flicker issue when switching source with a transition time of 0
+   
+ - [QTBUG-3620] Fixed bug on X11 that caused bitmap fonts to become so small 
+   it was unreadable when printed or presented in a print preview widget. 
+   
+ - [QTBUG-4445] Fixed bug on Windows that caused problems when printing 
+   text where several characters were represented by a single glyph, e.g. 
+   a double 't' with the Calibri font.
+   
  - EGL and OpenGL/ES
    * Protect the use of version-specific EGL symbols with #ifdef's.
    * Make sure an EGL context is current when resolving GL extensions.
@@ -862,6 +912,60 @@ Qt for Embedded Linux
 
  - Add powerpc mkspec and remove "empty" ppc mkspec .
 
+DirectFB
+--------
+
+ - When running Qt/DirectFB the DirectFB window id of a top level QWidget can
+   be queried using property("_q_DirectFBWindowID")
+
+ - Allow setting the background color of the primary layer in DirectFB with
+   connect options. QWS_DISPLAY=directfb:bgcolor=red or
+   QWS_DISPLAY=directfb:bgcolor=\#aabbccdd
+
+ - Add support for rendering mouse cursor using a top level window when cursor
+   support is not working in IDirectFBDisplayLayer. Define
+   QT_DIRECTFB_WINDOW_AS_CURSOR to enable.
+
+ - Add experimental support for optimized locking/unlocking of surfaces. Enable
+   by defining QT_DIRECTFB_SUBSURFACE.
+
+ - Fix a bug to conceptually allow using QDirectFBScreen as a subscreen of a
+   proxy screen. Don't make QDirectFBScreen::instance() assume that
+   QScreen::instance() is a QDirectFBScreen.
+
+ - Optimize move/resize operations with DirectFB. With a properly configured
+   DirectFB these operations are handled for us and we don't need to force a
+   repaint of the window.
+
+ - Support top level window opacity in DirectFB
+
+ - Fix a bug when loading RGB32 images that would lead to rendering issues.
+
+ - Fix a bug when painting with invalid pens/brushes.
+
+ - Fix a bug that would show up when QWidget::scroll is called.
+
+ - Implement support for loading pixmaps using IDirectFBImageProvider.
+
+ - Disable color table support by default. This seems to work incorrectly on
+   most boards and loading these images will generally require an image
+   conversion anyway.
+
+ - Fix a crash when resizing windows.
+
+ - Compile with versions < 1.0. We still recommend using newer versions.
+
+ - Considerable code cleanup
+
+ - Various optimizations regarding painting, loading of images and creation of
+   surfaces.
+
+ - Allow forcibly falling back to raster engine for painting operations by
+   exporting QT_DIRECTFB_FORCE_RASTER=1
+
+ - Reenable support for RGB32 primary surface.
+
+
 Qt for Windows CE
 -----------------
 
@@ -931,61 +1035,6 @@ Qt for Windows CE
 
 
 ****************************************************************************
-*                               DirectFB                                   *
-****************************************************************************
-
- - When running Qt/DirectFB the DirectFB window id of a top level QWidget can
-   be queried using property("_q_DirectFBWindowID")
-
- - Allow setting the background color of the primary layer in DirectFB with
-   connect options. QWS_DISPLAY=directfb:bgcolor=red or
-   QWS_DISPLAY=directfb:bgcolor=\#aabbccdd
-
- - Add support for rendering mouse cursor using a top level window when cursor
-   support is not working in IDirectFBDisplayLayer. Define
-   QT_DIRECTFB_WINDOW_AS_CURSOR to enable.
-
- - Add experimental support for optimized locking/unlocking of surfaces. Enable
-   by defining QT_DIRECTFB_SUBSURFACE.
-
- - Fix a bug to conceptually allow using QDirectFBScreen as a subscreen of a
-   proxy screen. Don't make QDirectFBScreen::instance() assume that
-   QScreen::instance() is a QDirectFBScreen.
-
- - Optimize move/resize operations with DirectFB. With a properly configured
-   DirectFB these operations are handled for us and we don't need to force a
-   repaint of the window.
-
- - Support top level window opacity in DirectFB
-
- - Fix a bug when loading RGB32 images that would lead to rendering issues.
-
- - Fix a bug when painting with invalid pens/brushes.
-
- - Fix a bug that would show up when QWidget::scroll is called.
-
- - Implement support for loading pixmaps using IDirectFBImageProvider.
-
- - Disable color table support by default. This seems to work incorrectly on
-   most boards and loading these images will generally require an image
-   conversion anyway.
-
- - Fix a crash when resizing windows.
-
- - Compile with versions < 1.0. We still recommend using newer versions.
-
- - Considerable code cleanup
-
- - Various optimizations regarding painting, loading of images and creation of
-   surfaces.
-
- - Allow forcibly falling back to raster engine for painting operations by
-   exporting QT_DIRECTFB_FORCE_RASTER=1
-
- - Reenable support for RGB32 primary surface.
-
-
-****************************************************************************
 * Important Behavior Changes *
 ****************************************************************************
 
@@ -1106,3 +1155,10 @@ Qt for Windows CE
     X11: LIBS += -lX11
     Mac: LIBS += -framework AppKit -framework Carbon
 
+- QtScript: Behavior changes due to using JavaScriptCore in the back-end:
+  * QDateTime is no longer used for date parsing and string conversion of
+    Date objects; instead the (more compliant) date processing from
+    JavaScriptCore is used.
+  * RegExp objects are no longer thin wrappers around QRegExp; they are now
+    "proper" JavaScript RegExp objects.
+