Merge branch '4.6'

Conflicts:
	doc/src/qt4-intro.qdoc

2 files changed, 76 insertions, 119 deletions

diff --git a/dist/README b/dist/README
index d8ab958..05475e7 100644
--- a/dist/README
+++ b/dist/README
@@ -6,7 +6,7 @@ http://qt.nokia.com/doc/latest/qt4-intro.html for details.
 
 The Qt 4.x series is not binary compatible or source compatible with
 the 3.x series. For more information on porting from Qt 3 to Qt 4, see
-http://qt.nokia.com/doc/latest/porting4.html .
+http://qt.nokia.com/doc/latest/porting4.html.
 
 
 INSTALLING Qt
@@ -37,58 +37,11 @@ The Qt reference documentation is available locally in Qt's doc/html
 directory. You can use Qt Assistant to view it; to launch Assistant,
 type 'assistant' on the command line or use the Start menu. On Mac OS
 X, you can find it in /Developer/Applications/Qt.  The latest
-documentation is available at http://qt.nokia.com/doc/ .
+documentation is available at http://qt.nokia.com/doc/.
 
 
 SUPPORTED PLATFORMS
 
-For this release, the following platforms have been tested:
-
-  win32-g++        (mingw)
-  win32-msvc
-  win32-msvc2003
-  win32-msvc2005
-  win32-msvc2008
-
-  aix-xlc
-  aix-xlc-64
-  hpux-acc
-  hpux-acc-64
-  hpux-acc-o64
-  hpux-g++
-  hpux-g++-64
-  hpuxi-acc-32
-  hpuxi-acc-64
-  linux-g++
-  linux-icc
-  linux-icc-32
-  linux-icc-64
-  solaris-cc
-  solaris-cc-64
-  solaris-g++
-  solaris-g++-64
-
-  macx-g++
-  macx-g++42
-
-  qws/linux-x86-g++
-  qws/linux-arm-g++
-
-  wince50standard-armv4i-msvc2005
-  wince50standard-armv4i-msvc2008
-  wince50standard-mipsii-msvc2005
-  wince50standard-mipsii-msvc2008
-  wince50standard-x86-msvc2005
-  wince50standard-x86-msvc2008
-  wincewm50pocket-msvc2005
-  wincewm50pocket-msvc2008
-  wincewm50smart-msvc2005
-  wincewm50smart-msvc2008
-  wincewm60professional-msvc2005
-  wincewm60professional-msvc2008
-  wincewm60standard-msvc2005
-  wincewm60standard-msvc2008
-
 For a complete list of supported platforms, see
 http://qt.nokia.com/doc/latest/supported-platforms.html.
 
diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3
index df282b0..1edacac 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -17,27 +17,65 @@ Each of these identifiers can be entered in the task tracker to obtain more
 information about a particular change.
 
 ****************************************************************************
-*                           General                                        *
+*                          Library                                         *
 ****************************************************************************
 
-General Improvements
---------------------
+- QColorDialog
+    * [256164] Fixed the setting of alpha values in QColorDialog.
 
-- Documentation and Examples
+- QDirIterator
+    * [258230] Fixed inconsistencies in value returned from
+      QDirIterator::next().
 
-Third party components
-----------------------
+- QDoubleSpinBox
+    * [255019] Fixed a crash when using large value for decimals.
 
+- QInputDialog
+    * [255502] Fixed bug in getDouble().
 
-****************************************************************************
-*                          Library                                         *
-****************************************************************************
+- 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.
+
+- 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.
 
+- 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                           *
@@ -45,79 +83,45 @@ Third party components
 
 Qt for Linux/X11
 ----------------
-
-
-Qt for Windows
---------------
+- Fixed a bug where an empty KDEDIRS variable would bring /share into the icon
+  search path.
+- [KDE 191759] Plasma spinning in endless loop.
+- 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 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
 -----------------
-
-
-****************************************************************************
-*                      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.