Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstatictext-4.6

1 files changed, 65 insertions, 10 deletions

diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
index d35f945..c679ce6 100644
--- a/dist/changes-4.6.2
+++ b/dist/changes-4.6.2
@@ -40,14 +40,30 @@ Optimizations
 QtCore
 ------
 
- - foo
-    * bar
+ - QXmlStreamWriter
+    * [QTBUG-6893] Fixed adding extra Byte Order Marks when writing to a xml file.
 
 QtGui
 -----
 
- - foo
-    * bar
+ - QAbstractScrollArea
+    * [QTBUG-1760] Reverted horizontal scrolling with mouse wheel when vertical scrollbar is hidden
+
+ - QBmpHandler
+    * [QTBUG-7530] Fixed an infinite loop that could occur when reading invalid BMP images.
+
+ - QGraphicsEffect
+    * [QTBUG-6901] Fixed performance problem when translating items with
+      graphics effects.
+
+ - QImage
+    * [QTBUG-7231] Avoid an unnecessary copy in QImage::scaled().
+
+ - QPDFEngine
+    * [QTBUG-7249] Fixed the encoding of the Tile and Creator tags in the PDF engine.
+
+ * [QTBUG-7029] Fixed a crash when re-creating QApplication object due to a
+   dangling gesture manager pointer.
 
 QtDBus
 ------
@@ -64,8 +80,22 @@ QtNetwork
 QtOpenGL
 --------
 
- - foo
-    * bar
+ - [QTBUG-7490] Better support for user-generated binary shaders.
+
+ - QGLWidget
+    * [QTBUG-7213] Fixed QGLWidget::renderPixmap() on Windows.
+
+ - QGLPixelBuffer
+    * [QTBUG-7476] Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
+
+ - QGL2PaintEngineEx
+    * [QTBUG-7203] Reset the GL stencil mask, op and function in resetGLState().
+
+QtOpenVG
+--------
+
+ - [QTBUG-7791] Optimize single-rect IntersectClip in OpenVG using the scissor.
+ - [QTBUG-7864] Use OpenVG scissor on 90/180/270 rotations and simple clips.
 
 QtScript
 --------
@@ -85,6 +115,12 @@ QtXml
  - foo
     * bar
 
+QtMultimedia
+------------
+
+ - QAudioInput
+    * [QTBUG-7044]: QAudioInput stopped working correctly after suspend()/resume() on linux.
+
 Qt Plugins
 ----------
 
@@ -110,8 +146,11 @@ Qt for Unix (X11 and Mac OS X)
 
 Qt for Linux/X11
 ----------------
+  * Fix a bug where QPixmap::serialNumber was not set on a transformed pixmap
+    in Qt/X11.
 
- -
+  * Fixed a crash when an input method tries to create a widget after the
+    application is destroyed.
 
 Qt for Windows
 --------------
@@ -121,7 +160,12 @@ Qt for Windows
 Qt for Mac OS X
 ---------------
 
- -
+ - QPrintPreviewDialog
+    * [QTBUG-7312]: Menubar and dock disappear after hiding a fullscreen widget on Cocoa.
+    * [QTBUG-7481]: Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
+    * [QTBUG-7522]: Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
+    * [QTBUG-7625]: Calling showFullScreen() then showNormal() on a widget results in top menu hiding.
+
 
 Qt for Embedded Linux
 ---------------------
@@ -130,7 +174,13 @@ Qt for Embedded Linux
 
 DirectFB
 --------
-
+  * Fix a bug where QPixmap::serialNumber was not set on a transformed pixmap
+    in DirectFB.
+  * Reimplement QPixmapData::scroll for QDirectFBPixmapData which optimizes
+    QPixmap::scroll
+  * Fix a rendering issue for semi-transparent top level windows in DirectFB.
+  * Make it possible to fall back to the raster engine for stretch blits in
+    DirectFB using QT_NO_DIRECTFB_STRETCHBLIT
  -
 
 Qt for Windows CE
@@ -143,7 +193,12 @@ Qt for Windows CE
 ****************************************************************************
 
  - Designer
-   * foo
+   * [QTBUG-6965] Enabled editing seconds of QDateTime-type properties
+   * [QTBUG-6757] Fixed bug where selection handles would be affected by
+     a style sheet set on the main form.
+
+ - uic3
+   * [QTBUG-7404] Added option to preserve layout names set by Qt 3 Designer.
 
  - qdoc3
    * bar