Merge remote branch 'origin/4.6' into 4.6-platform

2 files changed, 66 insertions, 14 deletions

diff --git a/dist/README b/dist/README
index 05475e7..1c52eb3 100644
--- a/dist/README
+++ b/dist/README
@@ -19,17 +19,22 @@ On Mac OS X, the binary package requires Mac OS X 10.4.x (Tiger) or
 later and GCC 4.0.1 to develop applications. Its applications will run
 on Mac OS X 10.3.9 and above.
 
-If you have a source package (a .tar.gz, .tar.bz2, or .zip file),
-follow the instructions in the INSTALL file.
+If you have a source package (a .tar.gz, or .zip file), follow the
+instructions in the INSTALL file.
 
 
 DEMOS AND EXAMPLES
 
 Once Qt is installed, we suggest that you take a look at the demos and
-examples to see Qt in action. Run the Qt Examples and Demos either by
+examples to see Qt in action.
+
+For desktop computers, run the Qt Examples and Demos either by
 typing 'qtdemo' on the command line or through the desktop's Start
 menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
 
+For embedded devices, launch the Qt 'fluidlauncher' demo, either through 
+the platforms filebrowser or the built in menu system.
+
 
 REFERENCE DOCUMENTATION
 
@@ -43,7 +48,7 @@ documentation is available at http://qt.nokia.com/doc/.
 SUPPORTED PLATFORMS
 
 For a complete list of supported platforms, see
-http://qt.nokia.com/doc/latest/supported-platforms.html.
+http://qt.nokia.com/doc/%VERSION%/supported-platforms.html.
 
 
 COMMERCIAL EDITIONS
@@ -56,16 +61,18 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
 Qt3Support modules.
 
 For a full listing of the contents of each module, please refer to 
-http://qt.nokia.com/doc/latest/modules.html
+http://qt.nokia.com/doc/%VERSION%/modules.html
 
 
 HOW TO REPORT A BUG
 
 If you think you have found a bug in Qt, we would like to hear about
-it so that we can fix it. Before reporting a bug, please check
-http://qt.nokia.com/developer/faqs/ and
-http://qt.nokia.com/products/appdev/platform/platforms/ to see if
-the issue is already known.
+it so that we can fix it.  The Qt bug tracking system is open to the
+public at http://bugreports.qt.nokia.com/.
+
+Before reporting a bug, please use the bug-tracker's search functions
+and consult http://qt.nokia.com/developer/faqs/ to see if the issue is
+already known.
 
 Always include the following information in your bug report: the name
 and version number of your compiler; the name and version number of
@@ -74,11 +81,9 @@ configure options it was compiled with.
 
 If the problem you are reporting is only visible at run-time, try to
 create a small test program that shows the problem when run. Often,
-such a program can be created with some minor changes to one of the
-many example programs in Qt's examples directory. Please submit the
-bug report using the Task Tracker on the Qt website:
-
-http://qt.nokia.com/developer/task-tracker
+such a program can be created with some minor changes to one of the many
+example programs in Qt's examples directory, or to the autotests that
+are available in the public source repository on http://qt.gitorious.org/.
 
 
 Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index eadc5c9..f90777d 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -61,6 +61,9 @@ Third party components
 
 QtCore
 
+ - QByteArray
+    * New overloads for QByteArray::insert() and QByteArray::prepend()
+
  - QObject
     * [259514] fixed a possible dead-lock in the destructor
 
@@ -95,6 +98,9 @@ QtCore
     * Improved reading utf8/utf16/utf32 data by correctly skipping the
       ByteOrderMark when reading data by one character at a time.
 
+- QXmlStreamWriter
+    * [256468] fix comment indentation
+
 QtGui
 - QGraphicsAnchorLayout
     * Support for expanding size policy has been removed. (The Qt 4.6 Beta had support for it).
@@ -250,6 +256,42 @@ QtGui
  - QApplication
    * [QTBUG-739] Removed internal widgets from QApplication::topLevelWidgets().
 
+QtNetwork
+
+ - QAbstractSocket
+    * only disconnect from host when all bytes have been written
+    * New setSocketOption method.
+
+ - QHttp
+    * Do not buffer the complete POST data anymore when HTTPS is used.
+    * QHttp is now obsolete and replaced by QNetworkAccessManager.
+
+ - QLocalServer
+    * fix timeout when waiting for a connection on Unix
+
+ - QNativeSocketEngine
+    * Do not set the OS socket send and receive buffer size. The OS
+      should auto tune these values for us.
+
+ - QNetworkAcessManager
+    * [242916] add possibility to send HTTP DELETE requests
+    * Connection count per HTTP server increased to 6 on Desktop, 3 on Symbian.
+    * Optional HTTP pipelining support.
+    * General HTTP performance improvements.
+
+ - QNetworkReply
+    * [257322] add possibility to ignore specific SSL errors
+    * New isFinished() method.
+
+ - QSslCertificate
+    * [251830] fix version() and serialNumber() methods
+
+ - QSslSocket
+    * [257322] add possibility to ignore specific SSL errors
+    * Fix build with openssl 1.0.0 betas
+    * Trigger a SSL transmission when reading from the socket. In certain
+      cases the connection stalled when a buffer limit was used.
+
 QtOpenGL
 
  - QGLFormat
@@ -280,6 +322,11 @@ QtOpenGL
  - QGLGradientCache
    * [249919] Clean up the gradient cache in the right context.
 
+QtXml
+
+- QDomDocument
+    * set the codec to UTF-8 if codec not present or unknown
+
 ****************************************************************************
 *                      Platform Specific Changes                           *
 ****************************************************************************