Merge commit 'origin/4.5' into 4.6

Reviewed-by: Joao

Conflicts:
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/widgets/qspinbox.cpp
	tests/auto/qgraphicsview/tst_qgraphicsview.cpp

1 files changed, 53 insertions, 2 deletions

diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3
index df282b045b..d797b4cd14 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -33,11 +33,49 @@ Third party components
 *                          Library                                         *
 ****************************************************************************
 
+- 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()
+
+- QNetworkAccessManager
+    * [256240] Proper handling of HTTP redirect in AlwaysCache mode.
+    * [257662] Fix timing issues that could trigger double sending of an
+      HTTP request.
+    * [256630] Fix usage of QProgressDialog together with QNetworkReply.
+
+- QSslCertificate
+    * [256066] Fix loading of a PEM when the length was a multiple of 64.
+
+- QTemporaryFile
+    * [260165] Fixed a bug where temporary files would be left behind when
+      copying a file to a non-existing directory.
 
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
-
+- [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.
+- 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.
+- Fixed invalid length for numeric fields in oracle.
+- (ODBC) Fixed non-unicode strings should be strings, not bytearrays.
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
@@ -46,6 +84,10 @@ 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
 --------------
@@ -53,7 +95,16 @@ Qt for Windows
 
 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.
+         
 
 Qt for Embedded Linux
 ---------------------
@@ -61,7 +112,7 @@ Qt for Embedded Linux
 
 Qt for Windows CE
 -----------------
-
+[260702] Fixed restoring of minimized Windows.
 
 ****************************************************************************
 *                      Compiler Specific Changes                           *