Merge remote branch 'mainline/4.6' into 4.6

1 files changed, 47 insertions, 4 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 7c97aa5..24d8fc0 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -15,10 +15,6 @@ 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                                        *
 ****************************************************************************
@@ -634,6 +630,40 @@ Qt Plugins
     * [258526] Rotate the image if the tiff file contains an orientation tag.
     * [254317] Add support for mono and indexed format
 
+ - QPlainTextEdit
+    * Fixed crash when clicking on a text edit which was smaller than the 
+      height of the font used.
+	  
+ - QPrinter 
+    * [QTBUG-4497] Removed redundant SetPen command in the postscript code 
+      when reusing a QPrinter object.
+
+ - QTextLayout
+    * [QTBUG-4468] Count tabs as multiple characters when applying a fixed
+      column width.
+	* [176401] Take into account the negative right bearing of the last 
+      character in an item of text if the glyph extends beyond its ascent.
+	
+ - QTextDocument
+    * [207189] Support setting font size using short hand syntax in the 
+      CSS "font" property.
+	* [201228] Remove implicit margin on bullet lists when exporting to 
+      HTML.
+	* [240086] Fixed bug which caused floating objects which span several
+      pages to float into the second page of the document even when it's
+      the only existing object, causing the document to contain a blank
+      first page.
+	* [240325] Even when wrap mode is set to Qt::TextWordWrap, the layout
+      would sometimes break outside word boundaries when floating objects
+      affected the width available to the text. This has been fixed.
+ 
+ - QFontEngine 
+    * [QTBUG-2354] Support certain 'Microsoft' platform symbol fonts which 
+      also contain a regular unicode table for exactly the symbol range of
+      code points.
+	  
+ - QFontMetrics	  
+    * [176401] Account for right bearing in bounding rect.
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
@@ -821,6 +851,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.