Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (87 commits)
  Fix D-Bus calls with QDBus::BlockWithGui.
  Fixes:    Add some changes for 4.6.1
  Skip tst_QSystemLock::processes
  Autotest: set these files to executable. They are CGI scripts.
  Fix an issue with HTTP headers like "private, max-age=300".
  Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation
  My changes to changes-4.6.1
  my changelog for 4.6.1
  Revert "Fixed qxmlstream autotest when using shadow builds."
  Changed log updated
  doc: Updated the descriptions of the connection types.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
  Update changelog with some of my stuff
  my 4.6.1 changelog contributions
  doc: update snippets for QtScript function expressions
  Prevent a crash when creating an inputContext from the QApplication dtor.
  QNAM HTTP Code: Cache socket state inside ensureConnection()
  tst_qhttpnetworkconnection: Test also HEAD in some tests
  tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
  QNAM HTTP Code: When starting new request, prefer connected sockets.
  ...

1 files changed, 61 insertions, 7 deletions

diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
index 145e09e..4aa4d5a 100644
--- a/dist/changes-4.6.1
+++ b/dist/changes-4.6.1
@@ -40,12 +40,22 @@ 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.
+
  - QPixmap
     * load() and loadFromData() can now support compressed GL textures
       in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
@@ -54,6 +64,11 @@ QtGui
  - QGraphicsObject
     * 'id' property was removed. Use the 'objectName' property instead.
 
+ - QGraphicsScene
+    * [QTBUG-6654] Fix crashes when deleting QGraphicsItems in touch
+      event handlers.
+
+
 QtDBus
 ------
 
@@ -63,8 +78,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
 --------
@@ -118,17 +145,44 @@ Qt for Unix (X11 and Mac OS X)
 Qt for Linux/X11
 ----------------
 
- -
+ - 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
 --------------
 
- -
+ - 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
 ---------------
 
- -
+ - [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
 ---------------------