Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Memory leak in native Toolbar cleanup in Cocoa
  Fix copyright year.
  Bump version to 4.6.2.
  Add skeleton changes file for 4.6.2.
  Add released version of 4.6.1 changes file for posterity.
  Designer crashes when previewing QMainWindow with native Toolbar on Mac

32 files changed, 322 insertions, 192 deletions

diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
index 6e95fd5..3df6887 100644
--- a/dist/changes-4.6.1
+++ b/dist/changes-4.6.1
@@ -20,12 +20,6 @@ Merge Request:  http://qt.gitorious.org
 *                           General                                        *
 ****************************************************************************
 
-New features
-------------
-
- - SomeClass, SomeOtherClass
-    * New classes for foo, bar and baz
-
 Optimizations
 -------------
 
@@ -44,8 +38,8 @@ QtCore
 
  - QFile
     * Improve performance of getting the canonical filename on Linux
-      and Symbian by using realpath() system call
-    * Avoid stat() when opening a file
+      and Symbian by using realpath() system call.
+    * Avoid stat() when opening a file.
 
  - QLibrary and QPluginLoader
     * Do not look at the Qt patch-level version embedded in plugins'
@@ -60,7 +54,7 @@ QtCore
 
  - QXmlStreamreader
     * [merge request 1926] Fix parsing of DTDs that contain empty markup
-      declarations
+      declarations.
 
 QtGui
 -----
@@ -68,32 +62,21 @@ QtGui
  - QApplication
     * [QTBUG-6654] Fix crashes when deleting QWidgets in touch event
       handlers.
- - QPixmapCache
-    * Fixed a small leak when using the new QPixmapCAche::Key based API.
- - QPixmap
-    * load() and loadFromData() can now support compressed GL textures
-      in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
-      system is active and the appropriate extensions are present in the
-      GL implementation.
-    * [QTBUG-6840] Fixed load() to not modify referenced copies.
-    * [QTBUG-5840] Fixed a crash in fromImage() when passing in a null image.
-    * [QTBUG-6116] Fixed memory leak where a global object was not destroyed
-      at program exit.
- - QRasterPixmapData
-    * [QTBUG-6985] Fixed metric() to return the correct height in mm.
- - QGraphicsObject
-    * 'id' property was removed. Use the 'objectName' property instead.
- - QPrinter
-    * [QTBUG-3412] QGraphicsProxyWidgets are now rendered correctly when
-      printing a QGraphicsScene to PDF format.
- - QPainter
-    * [QTBUG-5939] Fixed incorrect redirection matrix that was causing
-      wrong transformation for QGraphicsProxyWidgets.
-    * [QTBUG-6684] Added optimizations of 32-bit blend functions
-      for ARM platforms with NEON support.
  - QGraphicsEffect
     * [QTBUG-5918] Fixed redraw bugs when using graphics effects on
       items while animating them by transformations.
+ - QGraphicsItem
+    * [QTBUG-5917] Fixed memory leaks when removing a QGraphicsEffect from
+      a QGraphicsItem or QWidget with setGraphicsEffect(0).
+    * [QTBUG-5859] Fixes incorrect rounding of the exposed rectangle of the
+      QGraphicsItem causing painting issues when scaling the QGraphicsView.
+    * [QTBUG-5071] Fixes transformation problems when grouping/ungrouping
+      the item with a QGraphicsItemGroup.
+ - QGraphicsObject
+    * 'id' property was removed. Use the 'objectName' property instead.
+ - QGraphicsScene
+    * [QTBUG-6654] Fix crashes when deleting QGraphicsItems in touch
+      event handlers.
  - QGraphicsView
     * [QTBUG-6935] When using CacheBackground, the background is now
       correctly repainted after the QGraphicsView is shown after being
@@ -101,29 +84,37 @@ QtGui
     * [QTBUG-6835] Mouse tracking is now automatically enabled when using
       AnchorUnderMouse for view transformation.
     * [QTBUG-6958] Fix speed regression in _q_polishItems()
-    * [QTBUG-6544] Fix a crash on the focus chain when removing items from the scene.
+    * [QTBUG-6544] Fix a crash on the focus chain when removing items from 
+      the scene.
     * Fix a crash in KDE/Plasma with QGraphicsView with topLevels.
- - QGraphicsItem
-    * [QTBUG-5917] Fixed memory leaks when removing a QGraphicsEffect from
-      a QGraphicsItem or QWidget with setGraphicsEffect(0).
-    * [QTBUG-5859] Fixes incorrect rounding of the exposed rectangle of the
-      QGraphicsItem causing painting issues when scaling the QGraphicsView.
-    * [QTBUG-5071] Fixes transformation problems when grouping/ungrouping
-      the item with a QGraphicsItemGroup.
  - QGraphicsWidget
-    * [QTBUG-6272] Only call updateFont if the font have changed.
+    * [QTBUG-6272] Only call updateFont if the font has changed.
+ - QPainter
+    * [QTBUG-5939] Fixed incorrect redirection matrix that was causing
+      wrong transformation for QGraphicsProxyWidgets.
+    * [QTBUG-6684] Added optimizations of 32-bit blend functions
+      for ARM platforms with NEON support.
+ - QPixmap
+    * load() and loadFromData() can now support compressed GL textures
+      in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
+      system is active and the appropriate extensions are present in the
+      GL implementation.
+    * [QTBUG-6840] Fixed load() to not modify referenced copies.
+    * [QTBUG-5840] Fixed a crash in fromImage() when passing in a null image.
+    * [QTBUG-6116] Fixed memory leak where a global object was not destroyed
+      at program exit.
+ - QPixmapCache
+    * Fixed a small leak when using the new QPixmapCache::Key based API.
+ - QPrinter
+    * [QTBUG-3412] QGraphicsProxyWidgets are now rendered correctly when
+      printing a QGraphicsScene to PDF format.
+ - QRasterPixmapData
+    * [QTBUG-6985] Fixed metric() to return the correct height in mm.
  - QTextDocument
     * [QTBUG-5397] Fixed printing of QTextDocuments not including custom
       text objects.
-
- - QTextDocument
     * [QTBUG-6051] Fixed an endless loop when printing a QTextDocument.
 
- - QGraphicsScene
-    * [QTBUG-6654] Fix crashes when deleting QGraphicsItems in touch
-      event handlers.
-
-
 QtDBus
 ------
 
@@ -132,49 +123,54 @@ QtDBus
       correctly when the sender name changes/appears on the bus.
     * [QTBUG-7041] Fixed marshalling of booleans in release mode.
     * [QT-2307] Fixed calls with the QDBus::BlockWithGui mode.
-
  - QDBusInterface
     * Made it continue working even when the remote object
       introspection fails.
-
  - QDBusInterface and qdbuscpp2xml
     * [QTBUG-5563] Fixed an issue with generating annotations in
-     signals
-
+      signals.
  - QDBusPendingReply and QDBusReply
     * [QTBUG-6571] Fixed a crash that would happen if you tried to
-      make a call with a disconnected QDBusConnection
+      make a call with a disconnected QDBusConnection.
 
 QtMultimedia
 ------------
 
  - QAudioOutput
    * [Merge request 418] Fixed compilation the example provided for
-     QAudioOutput::start
+     QAudioOutput::start.
 
 QtNetwork
 ---------
 
  - QNetworkAccessManager
-    * HTTP: Smaller improvements
-    * HTTP: Send our locale with the HTTP request
-    * HTTP: Start Accept-language and Authorization header with capital letter
-    * HTTP: Fix caching algorithm, matching RFC 2612 and the documentation
-    * HTTP [QTBUG-7060]: Fix an issue with headers like "private, max-age=300"
-    * file: Introduce special subclass for higher performance with file:// URLs
+    * HTTP: Send our locale with the HTTP request.
+    * HTTP: Start Accept-language and Authorization header with capital letter.
+    * HTTP: Fix caching algorithm, matching RFC 2612 and the documentation.
+    * HTTP [QTBUG-7060]: Fix an issue with headers like "private, max-age=300".
+    * file: Introduce special subclass for higher performance with file:// URLs.
  - QTcpSocket
-    * [QTBUG-5799] Fix waitForConnected() on Windows
+    * [QTBUG-5799] Fix waitForConnected() on Windows.
  - QNetworkProxyFactory
     * Fixed systemProxyForQuery(), it could sometimes return invalid empty list
-      on Windows
+      on Windows.
  - QNetworkCookieJar
-    * [QTBUG-5815] do not check paths when accepting cookies
+    * [QTBUG-5815] Do not check paths when accepting cookies.
  - QHostInfo
-    * Use 5 parallel threads for host lookup instead of 1
+    * Use five parallel threads for host lookup instead of one.
 
 QtOpenGL
 --------
 
+ - QGL2PaintEngineEx
+    * Performance: Don't mark brush as dirty if it hasn't changed.
+    * Performance: Use 3x3 PMV matrices rather than 4x4.
+    * Performance: Move the 0.5 offset we add for aliased rendering to
+      updateMatrix().
+    * Performance: Remove superfluous enable/disable vertex attrib arrays.
+    * Performance: Track the glVertexAttribPointer and only update it if it's
+      changed.
+    * [QTBUG-7094]  Introduce new "snapToPixelGrid" flag for drawText.
  - QGLContext
     * bindTexture(QString) now supports DDS, ETC1, PVRTC2, and PVRTC4
       compressed textures if the appropriate extensions are present
@@ -187,31 +183,24 @@ QtOpenGL
     * bindTexture(QImage): Fix GL_BGRA formats under OpenGL/ES by using
       the same value for both internal and external texture formats.
     * [QTBUG-5041] Disable depth testing while in renderText().
- - QGLPaintDevice
-    * [QTBUG-6204] Rebind window surface fbo after native GL rendering.
  - QGLEngineSelector
     * [QTBUG-5638] Detect GL2 based on fragment shaders, not programs.
       Fragment programs are a GL1 feature.
  - QGLFramebufferObject
     * [QTBUG-6712] Update docs to better explain how QPainter changes
       the GL state when used on an FBO.
- - QGLPixmapData
-    * [QTBUG-6902] Align GL_RGB data on a 4-byte line boundary.
- - QTriangulatingStroker
-    * [QTBUG-6045] Crash in dashed line handling in the GL stroker.
  - QGLGlyphCache
     * [QTBUG-6936] Fix memory leak of QGLGlyphCoord objects.
+ - QGLPaintDevice
+    * [QTBUG-6204] Rebind window surface FBO after native GL rendering.
+ - QGLPixmapData
+    * [QTBUG-6902] Align GL_RGB data on a 4-byte line boundary.
  - QGLWidget
     * [QTBUG-5002, QTBUG-6931] Fixed QGLWidget::renderText().
-    * Fixed WA_TranslucentBackground for QGLWidgets on X11/EGL
-    * Fix EGL surface leaks when re-parenting on X11/EGL
- - QGL2PaintEngineEx
-    * Performance: Don't mark brush as dirty if it hasn't changed
-    * Performance: Use 3x3 PMV matrices rather than 4x4
-    * Performance: Move the 0.5 offset we add for aliased rendering to updateMatrix()
-    * Performance: Remove superfluous enable/disable vertex arrtib arrays
-    * Performance: Track the glVertexAttribPointer and only update it if it's changed
-    * [QTBUG-7094]  Introduce new "snapToPixelGrid" flag for drawText
+    * Fixed WA_TranslucentBackground for QGLWidgets on X11/EGL.
+    * Fix EGL surface leaks when re-parenting on X11/EGL.
+ - QTriangulatingStroker
+    * [QTBUG-6045] Crash in dashed line handling in the GL stroker.
 
 QtOpenVG
 --------
@@ -227,32 +216,29 @@ QtOpenVG
 QtWebKit
 --------
 
-  - Fixed user agent string on Symbian (webkit.org/b/31961)
-  - QWebInspector: Don't disable when hiding (webkit.org/b/31851)
-  - Fix JavaScript prompt behaviour for empty/null strings (webkit.org/b/30914)
-  - Fixed lastIndexOf() on Symbian (webkit.org/b/31773)
-  - Fixed crash with Flash on Windows with MinGW
-  - Fixed wrapping of QObjects with recurring identity (webkit.org/b/31681)
-  - Fixed compilation with ICC
-  - Fixed assertion when dragging SVG images (webkit.org/b/32511)
-  - Fixed crash with ACID3 test on Symbian
-  - Fixed security issue XSL stylesheets and security origins.
-  - Added the framecapture example to the default build (merge request 2235)
-
-QtScript
---------
-
- - foo
-    * bar
+ - Fixed user agent string on Symbian (webkit.org/b/31961).
+ - QWebInspector: Don't disable when hiding (webkit.org/b/31851).
+ - Fix JavaScript prompt behaviour for empty/null strings (webkit.org/b/30914).
+ - Fixed lastIndexOf() on Symbian (webkit.org/b/31773).
+ - Fixed crash with Flash on Windows with MinGW.
+ - Fixed wrapping of QObjects with recurring identity (webkit.org/b/31681).
+ - Fixed compilation with ICC.
+ - Fixed assertion when dragging SVG images (webkit.org/b/32511).
+ - Added the framecapture example to the default build (merge request 2235)
+ - Fixed crash with ACID3 test on Symbian
+ - Fixed security issue XSL stylesheets and security origins.
 
 QtSql
 -----
 
- - [QTBUG-5373] Fixed QSqlRelationalTableModel doesn't correctly work with relation in other database schema.
- - [QTBUG-5298] (OCI) Fixed QSqlDatabase.tables() does not work with system tables.
- - [QTBUG-6421] Fixed setForwardOnly() for both OCI and SQLite
- - [QTBUG-6618] (ODBC) Fixed segfault when error string is larger than 256 chars.
- - [QTBUG-4461] (OCI) Fixed problem with clobs being handled as binary
+ - [QTBUG-5373] Fixed QSqlRelationalTableModel doesn't correctly work with
+   relation in other database schema.
+ - [QTBUG-5298] (OCI) Fixed QSqlDatabase.tables() does not work with system
+   tables.
+ - [QTBUG-6421] Fixed setForwardOnly() for both OCI and SQLite.
+ - [QTBUG-6618] (ODBC) Fixed segfault when error string is larger than 256
+   chars.
+ - [QTBUG-4461] (OCI) Fixed problem with clobs being handled as binary.
 
 QtSvg
 -----
@@ -262,13 +248,6 @@ QtSvg
       offsets.
     * [QTBUG-6899] Fixed crash when parsing invalid coordinate list.
 
-
-QtXml
------
-
- - foo
-    * bar
-
 Qt Plugins
 ----------
 
@@ -283,13 +262,6 @@ Qt Plugins
  - PNG plugin
     * [QTBUG-7161] Avoid a deep copy of QImage::bits() in the png writer.
 
-Third party components
-----------------------
-
- - Updated foo to version 2.3.9.
-
- - Updated bar to the latest version from baz.org.
-
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
@@ -300,89 +272,70 @@ Qt for Unix (X11 and Mac OS X)
 
  - [QTBUG-6755] Ensure we don't call select(2) with a negative timeout
    if the timer expires during timeout recalculation.
-
  - Added mkspecs for Sun CC that enable -library=stlport by default,
    to restore STL capability with that compiler.
-
- - [QTBUG-6576] Fixed compilation on HP-UX 11.11
-
- - [QTBUG-6961] Fixed compilation on HURD
+ - [QTBUG-6576] Fixed compilation on HP-UX 11.11.
+ - [QTBUG-6961] Fixed compilation on HURD.
 
 Qt for Linux/X11
 ----------------
 
  - [QTBUG-5732] Fixed querying of GLX extensions under X11.
  - [QTBUG-5547] Fixed handling of the "..." button.
- - Added new mkspec for Maemo targets (linux-g++-maemo)
- - Added new mkspec for Scratchbox host compiler (unsupported/linux-host-g++)
-
+ - Added new mkspec for Maemo targets (linux-g++-maemo).
+ - Added new mkspec for Scratchbox host compiler (unsupported/linux-host-g++).
  - QGuiEventDispatcherGlib (internal class)
     * Fix regression introduced in 4.6.0 that could cause X11 event
       processing to starve timer events.
-
  - QFileSystemWatcher
     * [QTBUG-4840] Fix memory leak in the dnotify implementation.
-
  - QIcon
     * [QTBUG-6121] Fixed a problem causing svg-based icon themes to look fuzzy.
-
  - QGtkStyle
     * [QTBUG-6484] Ensure that gtk-enable-mnemonics is respected.
 
 Qt for Windows
 --------------
- - [QTBUG-5145] Compile fixes for win32-icc.
 
+ - [QTBUG-5145] Compile fixes for win32-icc.
  - QAtomicPointer
     * [QTBUG-6079] Fix compilation for 64-bit Windows targets.
-
  - QEventDispatchWin32 (internal class)
     * [QTBUG-6083] Fix a performance regression introduced in 4.6.0
       that would cause all Qt posted events to be sent at 15-16ms
       intervals (instead of as quickly as possible).
  - Vista/XP styles
     * [QTBUG-6271] Fixed a compatibility issue with MDI windows in 
-    certain non-standard themes.
+      certain non-standard themes.
 
 Qt for Mac OS X
 ---------------
 
  - QPixmap
    * [QTBUG-5070] Fixed a crash on Mac that could occur when loading
-   pixmaps of different sizes into the same QPixmap object.
- - [QTBUG-6973] Fixed a memory leak when using QWidget::setWindowIcon() in carbon.
+     pixmaps of different sizes into the same QPixmap object.
+ - [QTBUG-6973] Fixed a memory leak when using QWidget::setWindowIcon() in
+   Carbon.
  - [QTBUG-5186] Fixed a bug which caused drag and drop icons to show 
    incorrectly.
- - [QTBUG-6636] Fixed a crash due to stack overflow in QColorDialog  on cocoa.
+ - [QTBUG-6636] Fixed a crash due to stack overflow in QColorDialog on Cocoa.
  - [QTBUG-6378] Fix a text cursor rendering bug.
- - [QTBUG-6636] Fixed a crash when calling removeToolBar on Mac native toolbars using cocoa.
- - [QTBUG-5613] Fixed a bug where the application refued to quit when showing a single modal dialog.
- - Gestures are now available for the Carbon port also when building Qt against SDK < 10.6
-
-Qt for Embedded Linux
----------------------
-
- -
-
-DirectFB
---------
-
- -
-
-Qt for Windows CE
------------------
-
- -
+ - [QTBUG-6636] Fixed a crash when calling removeToolBar on Mac native toolbars
+   using Cocoa.
+ - [QTBUG-5613] Fixed a bug where the application refused to quit when showing
+   a single modal dialog.
+ - Gestures are now available for the Carbon port also when building Qt against
+   SDK < 10.6
 
 Qt for Symbian
 --------------
 
  - QApplication
    * [QTBUG-6098] Added a flag to avoid construction of application panes.
-
  - Other:
    * [QTBUG-4990] Rewrote most of the regular pointer handling.
 
+
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************
@@ -397,12 +350,6 @@ Qt for Symbian
    * [QTBUG-5824] Fixed code generation to generate a call to
      QMainWindow::setCentralWidget() for promoted widgets as well.
 
- - qdoc3
-   * bar
-
- - Linguist
-   * baz
-
 ****************************************************************************
 * Important Behavior Changes *
 ****************************************************************************
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
new file mode 100644
index 0000000..d35f945
--- /dev/null
+++ b/dist/changes-4.6.2
@@ -0,0 +1,159 @@
+Qt 4.6.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.6.0.  For more details,
+refer to the online documentation included in this distribution. The
+documentation is also available online:
+
+  http://qt.nokia.com/doc/4.6
+
+The Qt version 4.6 series is binary compatible with the 4.5.x series.
+Applications compiled for 4.5 will continue to run with 4.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
+Tracker, or the Merge Request queue of the public source repository.
+
+Qt Bug Tracker: http://bugreports.qt.nokia.com
+Task Tracker:   http://qt.nokia.com/developer/task-tracker
+Merge Request:  http://qt.gitorious.org
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+New features
+------------
+
+ - SomeClass, SomeOtherClass
+    * New classes for foo, bar and baz
+
+Optimizations
+-------------
+
+ - Optimized foo in QSomeClass
+    * See list of Important Behavior Changes below
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+ - foo
+    * bar
+
+QtGui
+-----
+
+ - foo
+    * bar
+
+QtDBus
+------
+
+ - foo
+    * bar
+
+QtNetwork
+---------
+
+ - foo
+    * bar
+
+QtOpenGL
+--------
+
+ - foo
+    * bar
+
+QtScript
+--------
+
+ - foo
+    * bar
+
+QtSql
+-----
+
+ - foo
+    * bar
+
+QtXml
+-----
+
+ - foo
+    * bar
+
+Qt Plugins
+----------
+
+ - foo
+    * bar
+
+Third party components
+----------------------
+
+ - Updated foo to version 2.3.9.
+
+ - Updated bar to the latest version from baz.org.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Unix (X11 and Mac OS X)
+------------------------------
+
+ - 
+
+Qt for Linux/X11
+----------------
+
+ -
+
+Qt for Windows
+--------------
+
+ -
+
+Qt for Mac OS X
+---------------
+
+ -
+
+Qt for Embedded Linux
+---------------------
+
+ -
+
+DirectFB
+--------
+
+ -
+
+Qt for Windows CE
+-----------------
+
+ -
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+ - Designer
+   * foo
+
+ - qdoc3
+   * bar
+
+ - Linguist
+   * baz
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+ -
+
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 298e0be..44d6ed6 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -1046,7 +1046,7 @@
     distributed under the following license.
     
     \legalese
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     All rights reserved.\br
     Contact: Nokia Corporation (qt-info@nokia.com)
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index f350d1a..abdafc3 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -44,11 +44,11 @@
 
 #include <stddef.h>
 
-#define QT_VERSION_STR   "4.6.1"
+#define QT_VERSION_STR   "4.6.2"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040601
+#define QT_VERSION 0x040602
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 354a666..b18830f 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -110,6 +110,7 @@
 #include "qevent_p.h"
 #include "qdnd_p.h"
 #include <QtGui/qgraphicsproxywidget.h>
+#include "qmainwindow.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -1721,6 +1722,15 @@ bool QWidgetPrivate::qt_widget_rgn(QWidget *widget, short wcode, RgnHandle rgn,
 void QWidgetPrivate::determineWindowClass()
 {
     Q_Q(QWidget);
+#if !defined(QT_NO_MAINWINDOW) && !defined(QT_NO_TOOLBAR)
+    // Make sure that QMainWindow has the MacWindowToolBarButtonHint when the
+    // unifiedTitleAndToolBarOnMac property is ON. This is to avoid reentry of
+    // setParent() triggered by the QToolBar::event(QEvent::ParentChange).
+    QMainWindow *mainWindow = qobject_cast<QMainWindow *>(q);
+    if (mainWindow && mainWindow->unifiedTitleAndToolBarOnMac()) {
+        data.window_flags |= Qt::MacWindowToolBarButtonHint;
+    }
+#endif
 #ifndef QT_MAC_USE_COCOA
 // ### COCOA:Interleave these better!
 
@@ -2743,7 +2753,9 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
         }
         if (wasWindow) {
             oldToolbar = [oldWindow toolbar];
+            [oldToolbar retain];
             oldToolbarVisible = [oldToolbar isVisible];
+            [oldWindow setToolbar:nil];
         }
 #endif
     }
@@ -2787,6 +2799,7 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
             if (oldToolbar && !(f & Qt::FramelessWindowHint)) {
                 OSWindowRef newWindow = qt_mac_window_for(q);
                 [newWindow setToolbar:oldToolbar];
+                [oldToolbar release];
                 [oldToolbar setVisible:oldToolbarVisible];
             }
 #endif
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index e41c2be..ee79f5a 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -476,6 +476,17 @@ void QMainWindowLayout::cleanUpMacToolbarItems()
         CFRelease(toolbarItemsCopy.at(i));
     toolbarItemsCopy.clear();
     unifiedToolbarHash.clear();
+
+#ifdef QT_MAC_USE_COCOA
+    QMacCocoaAutoReleasePool pool;
+
+    OSWindowRef window = qt_mac_window_for(layoutState.mainWindow);
+    NSToolbar *macToolbar = [window toolbar];
+    if (macToolbar) {
+      [[macToolbar delegate] release];
+      [macToolbar setDelegate:nil];
+    }
+#endif
 }
 
 void QMainWindowLayout::fixSizeInUnifiedToolbar(QToolBar *tb) const
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index 0720170..fed1658 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index 393893c..2a8a782 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index b66f8f9..3af8b40 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.1
+   VERSION=4.6.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/qbase.pri b/src/qbase.pri
index d1a2a75..d9832a1 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE	= lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.1
+   VERSION=4.6.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index c250d0c..6daa470 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/xmlpatterns/parser/qquerytransformparser_p.h b/src/xmlpatterns/parser/qquerytransformparser_p.h
index 204b6f8..0b316ec 100644
--- a/src/xmlpatterns/parser/qquerytransformparser_p.h
+++ b/src/xmlpatterns/parser/qquerytransformparser_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/xmlpatterns/parser/qxslttokenlookup.cpp b/src/xmlpatterns/parser/qxslttokenlookup.cpp
index a46ec8a..781ba0d 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup.cpp
+++ b/src/xmlpatterns/parser/qxslttokenlookup.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/xmlpatterns/parser/qxslttokenlookup_p.h b/src/xmlpatterns/parser/qxslttokenlookup_p.h
index b45407d..6d004b0 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup_p.h
+++ b/src/xmlpatterns/parser/qxslttokenlookup_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index ea7f36c..c674202 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro
index 5417b50..2f27c4a 100644
--- a/tests/auto/mediaobject/dummy/dummy.pro
+++ b/tests/auto/mediaobject/dummy/dummy.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.1
+   VERSION=4.6.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index a941f21..1b65adf 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Cmptest::initTestCase()
 PASS   : tst_Cmptest::compare_boolfuncs()
 PASS   : tst_Cmptest::compare_pointerfuncs()
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index 692fddb..aabe83d 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Crashes::initTestCase()
 QFATAL : tst_Crashes::crash() Received signal 11
 FAIL!  : tst_Crashes::crash() Received a fatal error.
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt
index 5755c97..3fe237a 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/selftests/expected_longstring.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_LongString *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_LongString::initTestCase()
 FAIL!  : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt
index 032a3e8..8bafeff 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/selftests/expected_maxwarnings.txt
@@ -1,5 +1,5 @@
 ********* Start testing of MaxWarnings *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : MaxWarnings::initTestCase()
 QWARN  : MaxWarnings::warn() 0
 QWARN  : MaxWarnings::warn() 1
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index e687759..c4ef92d 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/selftests/expected_skip.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Skip *********
-Config: Using QTest library 4.6.1, Qt 4.6.1
+Config: Using QTest library 4.6.2, Qt 4.6.2
 PASS   : tst_Skip::initTestCase()
 SKIP   : tst_Skip::test() skipping all
    Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]
diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/selftests/expected_xunit.txt
index d5cd531..5ec4668 100644
--- a/tests/auto/selftests/expected_xunit.txt
+++ b/tests/auto/selftests/expected_xunit.txt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="5" failures="3" tests="9" name="tst_Xunit">
   <properties>
-    <property value="4.6.1" name="QTestVersion"/>
-    <property value="4.6.1" name="QtVersion"/>
+    <property value="4.6.2" name="QTestVersion"/>
+    <property value="4.6.2" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testFunc1">
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui b/tests/auto/uic/baseline/config_fromuic3.ui
index 0bd6256..2e7addb 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui
+++ b/tests/auto/uic/baseline/config_fromuic3.ui
@@ -3,7 +3,7 @@
   <author></author>
   <comment>*********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui.h b/tests/auto/uic/baseline/config_fromuic3.ui.h
index ec20d05..6e22dc7 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui.h
+++ b/tests/auto/uic/baseline/config_fromuic3.ui.h
@@ -1,7 +1,7 @@
 /*
 *********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,7 +45,7 @@
 ** Form generated from reading UI file 'config_fromuic3.ui'
 **
 ** Created: Thu Dec 17 12:48:42 2009
-**      by: Qt User Interface Compiler version 4.6.1
+**      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index 584c3ce..b8726a4 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.2</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index adca7b4..38da552 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -17,7 +17,7 @@ qhp.Assistant.namespace           = com.trolltech.assistant.460
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Assistant.filterAttributes    = qt 4.6.1 tools assistant
+qhp.Assistant.filterAttributes    = qt 4.6.2 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
 qhp.Assistant.subprojects         = manual examples
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index d30ade9..57d21a9 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -17,7 +17,7 @@ qhp.Designer.namespace           = com.trolltech.designer.460
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Designer.filterAttributes    = qt 4.6.1 tools designer
+qhp.Designer.filterAttributes    = qt 4.6.2 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
 qhp.Designer.subprojects         = manual examples
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index f06671b..5860b33 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -17,7 +17,7 @@ qhp.Linguist.namespace           = com.trolltech.linguist.460
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Linguist.filterAttributes    = qt 4.6.1 tools linguist
+qhp.Linguist.filterAttributes    = qt 4.6.2 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
 qhp.Linguist.subprojects         = manual examples
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index ad27d75..0e7d960 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -17,7 +17,7 @@ qhp.qmake.namespace           = com.trolltech.qmake.460
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.qmake.filterAttributes    = qt 4.6.1 tools qmake
+qhp.qmake.filterAttributes    = qt 4.6.2 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
 qhp.qmake.subprojects         = manual
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index e9b9eb8..def4e67 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -32,9 +32,9 @@ qhp.Qt.extraFiles          = classic.css \
                              images/dynamiclayouts-example.png \
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.6.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.6.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
+qhp.Qt.filterAttributes    = qt 4.6.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.2
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index a99f73e..1aefa98 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -34,9 +34,9 @@ qhp.Qt.extraFiles          = classic.css \
                              images/dynamiclayouts-example.png \
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.6.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.6.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
+qhp.Qt.filterAttributes    = qt 4.6.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.2
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf
index 391844b..ea9eaa6 100644
--- a/util/qlalr/doc/qlalr.qdocconf
+++ b/util/qlalr/doc/qlalr.qdocconf
@@ -59,7 +59,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
                           "</tr></table></div></address>"