Merge remote branch 'qt/4.6' into oslo-staging-2/4.6

Conflicts:
	dist/changes-4.6.1

1 files changed, 62 insertions, 5 deletions

diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
index ff1f7fe4ab..3d7a7b9007 100644
--- a/dist/changes-4.6.1
+++ b/dist/changes-4.6.1
@@ -40,12 +40,21 @@ Optimizations
 QtCore
 ------
 
- - foo
-    * bar
+ - QFile
+    * Improve performance of getting the canonical filename on Linux
+      and Symbian by using realpath() system call
+    * Avoid stat() when opening a file
+
+ - QXmlStreamreader
+    * [merge request 1926] Fix parsing of DTDs that contain empty markup
+      declarations
 
 QtGui
 -----
 
+ - QApplication
+    * [QTBUG-6654] Fix crashes when deleting QWidgets in touch event
+      handlers.
  - QPixmapCache
     * Fixed a small leak when using the new QPixmapCAche::Key based API.
  - QPixmap
@@ -97,6 +106,11 @@ QtGui
  - QTextDocument
     * [QTBUG-6051] Fixed an endless loop when printing a QTextDocument.
 
+ - QGraphicsScene
+    * [QTBUG-6654] Fix crashes when deleting QGraphicsItems in touch
+      event handlers.
+
+
 QtDBus
 ------
 
@@ -106,8 +120,20 @@ QtDBus
 QtNetwork
 ---------
 
- - foo
-    * bar
+ - QNetworkAccessManager
+    * HTTP: Smaller improvements
+    * HTTP: Send our locale with the HTTP request
+    * HTTP: Start Accept-language and Authorization header with capital letter
+    * file: Introduce special subclass for higher performance with file:// URLs
+ - QTcpSocket
+    * [QTBUG-5799] Fix waitForConnected() on Windows
+ - QNetworkProxyFactory
+    * Fixed systemProxyForQuery(), it could sometimes return invalid empty list
+      on Windows
+ - QNetworkCookieJar
+    * [QTBUG-5815] do not check paths when accepting cookies
+ - QHostInfo
+    * Use 5 parallel threads for host lookup instead of 1
 
 QtOpenGL
 --------
@@ -227,10 +253,33 @@ Qt for Linux/X11
  - Added new mkspec for Maemo targets (linux-g++-maemo)
  - Added new mkspec for Scratchbox host compiler (unsupported/linux-host-g++)
 
+ - QGuiEventDispatcherGlib (internal class)
+    * Fix regression introduced in 4.6.0 that could cause X11 event
+      processing to starve timer events.
+
+ - QFileSystemWatcher
+    * [QTBUG-4840] Fix memory leak in the dnotify implementation.
+
+ - QIcon
+    * [QTBUG-6121] Fixed a problem causing svg-based icon themes to look fuzzy.
+
+ - QGtkStyle
+    * [QTBUG-6484] Ensure that gtk-enable-mnemonics is respected.
+
 Qt for Windows
 --------------
  - [QTBUG-5145] Compile fixes for win32-icc.
- -
+
+ - QAtomicPointer
+    * [QTBUG-6079] Fix compilation for 64-bit Windows targets.
+
+ - QEventDispatchWin32 (internal class)
+    * [QTBUG-6083] Fix a performance regression introduced in 4.6.0
+      that would cause all Qt posted events to be sent at 15-16ms
+      intervals (instead of as quickly as possible).
+ - Vista/XP styles
+    * [QTBUG-6271] Fixed a compatibility issue with MDI windows in 
+    certain non-standard themes.
 
 Qt for Mac OS X
 ---------------
@@ -238,6 +287,14 @@ Qt for Mac OS X
  - QPixmap
    * [QTBUG-5070] Fixed a crash on Mac that could occur when loading
    pixmaps of different sizes into the same QPixmap object.
+ - [QTBUG-6973] Fixed a memory leak when using QWidget::setWindowIcon() in carbon.
+ - [QTBUG-5186] Fixed a bug which caused drag and drop icons to show 
+   incorrectly.
+ - [QTBUG-6636] Fixed a crash due to stack overflow in QColorDialog  on cocoa.
+ - [QTBUG-6378] Fix a text cursor rendering bug.
+ - [QTBUG-6636] Fixed a crash when calling removeToolBar on Mac native toolbars using cocoa.
+ - [QTBUG-5613] Fixed a bug where the application refued to quit when showing a single modal dialog.
+ - Gestures are now available for the Carbon port also when building Qt against SDK < 10.6
 
 Qt for Embedded Linux
 ---------------------