Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
	dist/changes-4.6.1

1 files changed, 61 insertions, 7 deletions

diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
index e31fc7cefc..6e95fd5b92 100644
--- a/dist/changes-4.6.1
+++ b/dist/changes-4.6.1
@@ -29,8 +29,10 @@ New features
 Optimizations
 -------------
 
- - Optimized foo in QSomeClass
-    * See list of Important Behavior Changes below
+ - Optimized empty QUrl creation
+    * [QTBUG-4030] Empty QUrls no longer allocate memory now
+
+ * See list of Important Behavior Changes below
 
 
 ****************************************************************************
@@ -45,6 +47,17 @@ QtCore
       and Symbian by using realpath() system call
     * Avoid stat() when opening a file
 
+ - QLibrary and QPluginLoader
+    * Do not look at the Qt patch-level version embedded in plugins'
+      buildkeys when trying to determine if the plugin is compatible
+
+ - QProcessEnvironment
+    * [QTBUG-6701] Ensure we don't crash in operator==
+
+ - QTextEncoder
+    * [merge request 399] QTextEncoder::fromUnicode as QT3 support
+      member
+
  - QXmlStreamreader
     * [merge request 1926] Fix parsing of DTDs that contain empty markup
       declarations
@@ -114,8 +127,30 @@ QtGui
 QtDBus
 ------
 
- - foo
-    * bar
+ - QDBusConnection
+    * [QTBUG-5979] Fixed the signal-delivery mechanism to update
+      correctly when the sender name changes/appears on the bus.
+    * [QTBUG-7041] Fixed marshalling of booleans in release mode.
+    * [QT-2307] Fixed calls with the QDBus::BlockWithGui mode.
+
+ - QDBusInterface
+    * Made it continue working even when the remote object
+      introspection fails.
+
+ - QDBusInterface and qdbuscpp2xml
+    * [QTBUG-5563] Fixed an issue with generating annotations in
+     signals
+
+ - QDBusPendingReply and QDBusReply
+    * [QTBUG-6571] Fixed a crash that would happen if you tried to
+      make a call with a disconnected QDBusConnection
+
+QtMultimedia
+------------
+
+ - QAudioOutput
+   * [Merge request 418] Fixed compilation the example provided for
+     QAudioOutput::start
 
 QtNetwork
 ---------
@@ -124,6 +159,8 @@ QtNetwork
     * HTTP: Smaller improvements
     * HTTP: Send our locale with the HTTP request
     * HTTP: Start Accept-language and Authorization header with capital letter
+    * HTTP: Fix caching algorithm, matching RFC 2612 and the documentation
+    * HTTP [QTBUG-7060]: Fix an issue with headers like "private, max-age=300"
     * file: Introduce special subclass for higher performance with file:// URLs
  - QTcpSocket
     * [QTBUG-5799] Fix waitForConnected() on Windows
@@ -187,7 +224,7 @@ QtOpenVG
  - [QTBUG-7051] Reset the OpenVG scissor after a native painting call-out.
  - [QTBUG-7015] Avoid deep copies of QImage in QImage::bits() calls.
 
-QtwebKit
+QtWebKit
 --------
 
   - Fixed user agent string on Symbian (webkit.org/b/31961)
@@ -200,6 +237,7 @@ QtwebKit
   - Fixed assertion when dragging SVG images (webkit.org/b/32511)
   - Fixed crash with ACID3 test on Symbian
   - Fixed security issue XSL stylesheets and security origins.
+  - Added the framecapture example to the default build (merge request 2235)
 
 QtScript
 --------
@@ -260,7 +298,15 @@ Third party components
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
 
- -
+ - [QTBUG-6755] Ensure we don't call select(2) with a negative timeout
+   if the timer expires during timeout recalculation.
+
+ - Added mkspecs for Sun CC that enable -library=stlport by default,
+   to restore STL capability with that compiler.
+
+ - [QTBUG-6576] Fixed compilation on HP-UX 11.11
+
+ - [QTBUG-6961] Fixed compilation on HURD
 
 Qt for Linux/X11
 ----------------
@@ -361,5 +407,13 @@ Qt for Symbian
 * Important Behavior Changes *
 ****************************************************************************
 
- -
+ - Phonon
+   * Include headers have been changed. The only official method for
+     including Phonon headers is <phonon/ClassName> or
+     <phonon/classname.h>. This change was necessary because of
+     frameworks on Mac.
+
+     Compatibility is provided for <Phonon/*> includes, but is not
+     guaranteed to work. Including <phonon> and <Phonon> is not
+     supported.