Merge remote branch 'origin/4.7' into qt-master-from-4.7

1 files changed, 57 insertions, 2 deletions

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 41fe9d2..a57575e 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -50,6 +50,12 @@ Third party components
 QtCore
 ------
 
+ - QMetaType
+    * Significantly improved performance of the type() function
+ - QState
+    * [QTBUG-7741] Added a function to get the out-going transitions
+ - QStateMachine
+    * [QTBUG-8842] Reset history states when (re)starting machine
  - QXmlStreamReader
     * [QTBUG-9196] fixed crash when parsing
  - QTimer
@@ -62,6 +68,9 @@ QtGui
     * Fixed a bug that would cause keyboard searches not to behave
       properly when used within 400 milliseconds of midnight.
 
+ - QComboBox
+    * [QTBUG-8796] Made ForegroundRole work for all styles.
+
  - QPrinter
     * Obsoleted the slightly confusing setNumCopies() and numCopies()
       functions, and replaced them with setCopyCount(), copyCount() and
@@ -117,9 +126,20 @@ QtGui
       operators (intersect, subtract, unite) to prevent numerical
       stability issues.
 
+ - QPixmap
+    * [QTBUG-4149] Fixed QPixmap::grabWidget() on widgets that have not yet
+      been shown.
+    
+ - QPlastiqueStyle
+    * [QTBUG-6516] Respect AlternateBase role for list views.
+
  - QRegion
     * [QTBUG-7699] Fixed crash caused by large x-coordinates.
 
+ - QSplitter
+    * [QTBUG-9335] Improve support for 1-pixel splitters by using a 
+      larger drag area.
+
  - QTransform
     * [QTBUG-8557] Fixed bug in QTransform::type() potentially occuring
       after using operator/ or operator* or their overloads.
@@ -146,6 +166,27 @@ QtNetwork
   * [QTBUG-2515] Do not make OpenSSL prompt for a password
   * [QTBUG-6504, QTBUG-8924, QTBUG-5645] Fix memleak
 
+QtOpenGL
+--------
+ - QGLWidget
+  * [QTBUG-7865] Fixed bug where GL widgets were not fully updated on
+    Windows Vista/7 with Aero disabled.
+
+QtScript
+--------
+ - Updated src/3rdparty/javascriptcore to a more recent version
+ - Significantly improved performance of the Qt/C++<-->JavaScript bridge
+ - QScriptValueIterator: Significantly improved performance
+ - [QTBUG-3637] Added a wrap option for excluding slots from a QObject binding
+ - [QTBUG-6238] Added a function for reporting additional memory cost
+ - [QTBUG-6908] Significantly improved performance of qsTr()
+
+QtSvg
+-----
+ - QSvgRenderer
+  * [QTBUG-8264] Fixed rounded rectangles when 'rx' or 'ry' is zero.
+  * [QTBUG-10022] Fixed assert failure when loading an invalid SVG.
+
 QtXmlPatterns
 -------------
 
@@ -179,10 +220,13 @@ Qt Plugins
 
 Qt for Linux/X11
 ----------------
-
+ - QGtkStyle
+    * Fixed rtl issues with sliders (QTBUG-8986)
+    * Fixed missing pressed appearance on scroll bar handles. (QTBUG-10396)  
 
 Qt for Windows
 --------------
+ - Popup windows now implicitly activate when shown. (QTBUG-7386)
 
  - QLocalSocket
     * Pipe handle leak fixed, when closing a QLocalSocket that still has
@@ -194,11 +238,15 @@ Qt for Windows
 
 Qt for Mac OS X
 ---------------
-
+ - QMacStyle
+    * Removed frame around statusbar items. (QTBUG-3574)
+    * More native appearance of item view headers and frames. (QTBUG-10047)    
 
 Qt for Embedded Linux
 ---------------------
 
+  * Add support for WA_TranslucentBackground (QTBUG-5739)
+  * Add support for QFont::NoAntialias (QTBUG-5936)
 
 Qt for Windows CE
 -----------------
@@ -286,3 +334,10 @@ Qt for Windows CE
 *                   Important Behavior Changes                             *
 ****************************************************************************
 
+QtScript: Changes due to updating src/3rdparty/javascriptcore:
+ - It is no longer possible to delete an undeletable property from C++
+   using QScriptValue::setProperty().
+ - The QScriptEngineAgent::positionChange() callback will always report
+   a column number of 1.
+ - QScriptValueIterator will include the "length" property when iterating
+   over Array objects.