Merge branch '4.5' into 4.6

Conflicts:
	doc/src/platform-notes.qdoc
	src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

1 files changed, 44 insertions, 91 deletions

diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3
index d797b4c..1edacac 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -17,34 +17,21 @@ Each of these identifiers can be entered in the task tracker to obtain more
 information about a particular change.
 
 ****************************************************************************
-*                           General                                        *
-****************************************************************************
-
-General Improvements
---------------------
-
-- Documentation and Examples
-
-Third party components
-----------------------
-
-
-****************************************************************************
 *                          Library                                         *
 ****************************************************************************
 
+- QColorDialog
+    * [256164] Fixed the setting of alpha values in QColorDialog.
+
 - QDirIterator
     * [258230] Fixed inconsistencies in value returned from
       QDirIterator::next().
 
-- QColorDialog
-    * [256164] Fixed the setting of alpha values in QColorDialog.
-
 - QDoubleSpinBox
     * [255019] Fixed a crash when using large value for decimals.
 
 - QInputDialog
-    * [255502] Fixed bug in getDouble()
+    * [255502] Fixed bug in getDouble().
 
 - QNetworkAccessManager
     * [256240] Proper handling of HTTP redirect in AlwaysCache mode.
@@ -52,6 +39,18 @@ Third party components
       HTTP request.
     * [256630] Fix usage of QProgressDialog together with QNetworkReply.
 
+- QPainter
+    * [254105] Fixed potential segmentation fault when setting empty clip
+      rectangle.
+    * [256549] Fixed inconsistent behavior between paint engines when
+      setting an IntersectClip after doing setClipping(false).
+    * [254407] Fixed rendering issue with outline drawing using
+      projective transforms.
+    * [258776] Fixed rounding bug in drawImage().
+
+- QPainterPath
+    * [251909] Fixed bug in QPainterPath::united() / simplified().
+
 - QSslCertificate
     * [256066] Fix loading of a PEM when the length was a multiple of 64.
 
@@ -62,15 +61,16 @@ Third party components
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
-- [QT-353] (ODBC) Fixed issue of forward only datasets failing when not 
-   explicitly set so.
+
+- [QT-353] (ODBC) Fixed issue of forward only datasets failing when not
+  explicitly set so.
 - [222678] Fixed QSqlTableModel: trying to delete the wrong row.
 - (Interbase) Fixed crash when calling numRows on unknown query type.
 - Fixed several database autotests.
 - Fixed determination of end of odbc string on deficient driver.
 - Fixed formatting of date strings in psql driver.
 - Fixed mysql queries automatically getting prepared. Now have to explicitly
-   prepare them if you want that functionality.
+  prepare them if you want that functionality.
 - Fixed failure when QSqlTableModel has null fields to update.
 - Fixed missing isnan/isinf on some platforms (needed for postgres driver)
 - Fixed ::record for dialect 3 named tables in interbase/firebird.
@@ -83,92 +83,45 @@ Third party components
 
 Qt for Linux/X11
 ----------------
-
 - Fixed a bug where an empty KDEDIRS variable would bring /share into the icon
   search path.
 - [KDE 191759] Plasma spinning in endless loop.
-
-
-Qt for Windows
---------------
+- QClipboard can copy/paste on all screens in a multiscreen configuration.
+- Fixed a bug that prevented QClipboard to work after some time.
 
 
 Qt for Mac OS X
 ---------------
-[252088] Drag and drop events will now consider the WA_TransparentForMouseEvents 
-         in Cocoa port.
-[255428] Fixed an an issue when Calling QWidget::raise() on hidden windows making
-         them visible in Cocoa port.
-[256269] Window resize events  triggered from QWidget::adjustSize() will now
-         be sent as non-spontaneous event in the Cocoa port.
-[258822] Fixed a crash when inserting the same menu twice in a menubar in Cocoa port.
-
--        Fixed the wizard background images for Snow Leopard.
-         
+- [252088] Drag and drop events will now consider the
+  WA_TransparentForMouseEvents in Cocoa port.
+- [255428] Fixed an issue when calling QWidget::raise() on hidden windows
+  making them visible in Cocoa port.
+- [256269] Window resize events triggered from QWidget::adjustSize() will now
+  be sent as a non-spontaneous event in the Cocoa port.
+- [258822] Fixed a crash when inserting the same menu twice in a menubar in
+  Cocoa port.
+- Fixed the wizard background images for Snow Leopard.
 
-Qt for Embedded Linux
----------------------
 
+Qt for Windows
+-----------------
+- [250188] Fixed size windows will show the maximize button if asked explicitely.
 
 Qt for Windows CE
 -----------------
-[260702] Fixed restoring of minimized Windows.
-
-****************************************************************************
-*                      Compiler Specific Changes                           *
-****************************************************************************
-
-
-****************************************************************************
-*                          Tools                                           *
-****************************************************************************
-
-- Build System
-
-- Assistant
-
-
-- Designer
-
-
-- Linguist
-  - Linguist GUI
-
-  - lupdate
-
-  - lrelease
-
-
-- rcc
-
-
-- moc
-
-
-- uic
-
-
-- uic3
-
-
-- qmake
-
-
-- configure
-
-
-- qtconfig
-
-
-- qt3to4
-
+- [260702] Fixed restoring of minimized Windows.
 
 ****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
 
-
-****************************************************************************
-*                   Important Behavior Changes                             *
-****************************************************************************
+- DirectFB
+    * Make autorepeat work for DirectFB keyboard driver.
+    * Fix a crash when resizing windows.
+    * Fix an off by one when flipping surfaces that could lead to artifacts.
+    * Make painting operations with QRegion clips go to DirectFB rather than
+      Raster (when possible).
+    * Make porter duff operations work for blits.
+    * Various optimizations.
+    * Handle more operations in hw.