Merge commit 'upstream/4.6' into 4.6

1 files changed, 60 insertions, 9 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index fe3d8b97e1..be2c89c842 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -48,6 +48,9 @@ Third party components
 
 QtCore
 
+ - QObject
+    * [259514] fixed a possible dead-lock in the destructor
+	
  - QVariant
     * Many optimisations
     * Added QVariant::toFloat() and QVariant::toReal()
@@ -76,7 +79,13 @@ QtCore
 
 QtGui
 
-- QGraphicsItem
+ - QCompleter
+    * [246056] Fixed a possible assertion when setting the completer prefix
+	
+ - QFontDialog
+    * [256466] fixed the dialog not always returning the selected style.
+	
+ - QGraphicsItem
     * Fixed bug and improved accuracy of QGraphicsItem::childrenBoundingRect().
     * Many optimizations.
     * Introduced QGraphicsItem::ItemHasNoContents
@@ -88,10 +97,10 @@ QtGui
     * Introduced QGraphicsItem::stackBefore()
     * Cached items are now always invalidated when update() is called.
 
-- QGraphicsObject
+ - QGraphicsObject
     * New class; inherits QGraphicsItem and adds notification signals and property declarations.
 
-- QGraphicsProxyWidget
+ - QGraphicsProxyWidget
     * [251407] Fixed window flag handling. Now QGraphicsProxyWidget's flags win.
     * Fix Qt::ClickFocus policy
 
@@ -104,24 +113,47 @@ QtGui
     * Introduced activation support.
     * Fixed bugs in initial focus support.
 
-- QGraphicsTextItem
+ - QGraphicsTextItem
     * Now inherits from QGraphicsObject instead
 
  - QGraphicsTransform
     * New class; eases animation of transformations for QGraphicsItem.
 
-- QGraphicsView
+ - QGraphicsView
     * Fix mapToScene(QRect) to avoid extra unnecessary adjustments.
     * Many optimizations.
     * Introduced QGraphicsView::isTransformed()
     * [QTBUG-4151] Items with parent that sets ItemClipsChildrenToShape were sometimes invisible.
 
-- QGraphicsWidget
+ - QGraphicsWidget
     * Now inherits from QGraphicsObject instead
 
+ - QHeaderView
+    * [208320] Make sure the sort indicator s taken into account for the size hint
+    * [255574] Make sure the sizehint for the section depend on visible sections
+
+ - QMainWindow
+    * [226060] Adding actions to a toolbar would always make the next toolbar move
+
+ - QMenuBar
+    * [260873] Fix mouse interaction while undocking a widget from the main window
+	* dock areas don't get a splitter if their dock widgets are not resizable
+	
+ - QColumnView
+    * [246999] Fixed view not updating when the model is changed dynamically
+	
+ - QListView
+    * [243335] Fixed the visualRect to return correct values when the widget is not yet show
+	
  - QTreeView
     * [234930] Be able to use :has-children and :has-sibillings in a stylesheet
     * [252616] Set QStyleOptionViewItemV4::OnlyOne flag when painting spanning columns
+	* [245654] Fixed expandAll when deleting and recreating a mode for the tree
+	* [239271] Fixed missing update when adding a row when the first column is hidden
+	* [258225] Fixed scrollTo with center and bottom
+
+ - QTreeWidget
+    * [253109] Shows the widget when calling setItemWidget
 
  - QTableView
     * [191545] Selections work more similarly to well-known spreadsheets
@@ -130,6 +162,9 @@ QtGui
       speed-up, support for rows/columns insertion/removal, and better keyboard
       navigation
 
+ - QTableWidget
+    * [234641] Fixed takeItem to cause the view to be updated.
+	
  - QTabBar
     * [196326] Fixed having a stylesheet on a QTabBar resulted in some tab names
       to be slightly clipped.
@@ -138,10 +173,10 @@ QtGui
  - QComboBox
     * [220195] Fixed keyboard search when current index is -1
 
-- QPixmap
+ - QPixmap
     * Optimized width(), height(), isNull() and depth().
 
-- QRegion
+ - QRegion
     * Minor optimizations.
 
  - QSpinBox
@@ -192,7 +227,7 @@ QtGui
 
  - On Windows CE the link time code geration has been disabled by default to
    be consistent with win32-msvc200x.
-
+   
  - Added QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and
    QMAKE_LIBS_OPENGL_ES2 qmake variables for specifying OpenGL ES
    specific libraries.
@@ -237,6 +272,12 @@ General changes on Mac OS X:
       Use the -arch flags to override.
     - Building for ppc64 is no longer supported by the gcc tool chain.
     - Building for ppc is still supported.
+   
+ - 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
 
 ****************************************************************************
 *                          Tools                                           *
@@ -409,4 +450,14 @@ General changes on Mac OS X:
  - On Mac OS X, QDesktopServices::storageLocation(DataLocation) now includes
    QCoreApplication::organizationName() and QCoreApplication::applicationName()
    if those are set. This matches the behavior on the other platforms.
+   
+ - The Animation Framework
+   * currentTime() now returns the complete current time including previous loops
+   * currentLoopTime() returns the time inside the current loop
+   * stateChanged signal sends the new state as first parameter and old state as
+     the second
+   * QAnimationGroup::clearAnimations() has been renames to clear()
+   * QAnimationGroup::insertAnimationAt() has been renames to insertAnimation()
+   * QAnimationGroup::takeAnimationAt() has been renames to takeAnimation()
+   * QSequentialAnimationGroup::insertPauseAt() has been renames to insertPause()