Add some of my changes to changes-4.6.0

Update changes-4.6.0 with relevant changes.

Reviewed-by: Trond

Conflicts:

	dist/changes-4.6.0

1 files changed, 44 insertions, 1 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index daea2a6970..03ee4a4fc0 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -307,6 +307,41 @@ QtDBus
     * Made sending of invalid/incomplete messages consistently fail
       with error (no more assertions).
 
+   - 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.
+
 QtNetwork
 
  - QAbstractSocket
@@ -480,6 +515,9 @@ Qt for Linux/X11
    when using Synergy.
  - [MR#797] Fixed a crash when using QX11EmbedContainer/Widget on x86_64.
  - [MR#1111] Emit workAreaResized when _NET_WORKAREA is changed on X11.
+ 
+ - [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. 
 
  - Improved EGL integration on X11 (including better visual selection).
 
@@ -537,6 +575,11 @@ Qt for Windows
      rendering.
    * Fixed a flicker issue when switching source with a transition time of 0
 
+ - [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.
+   
+
 Qt for Mac OS X
 ---------------
 
@@ -633,7 +676,7 @@ Qt for Windows CE
  - [257352] When configuring Qt for Windows CE, configure points the user to
    setcepaths, when its done.
  - [259850] Added a makespec template for Windows CE 6.
-
+   
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************