Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public

Conflicts:
	mkspecs/features/symbian/platform_paths.prf

1 files changed, 9 insertions, 7 deletions

diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index b10d603..82d3b79 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -592,15 +592,17 @@ void QDataStream::setByteOrder(ByteOrder bo)
     recommend that you do; see \l{Versioning} in the Detailed
     Description.
 
-    In order to accommodate new functionality, the datastream
-    serialization format of some Qt classes has changed in some
-    versions of Qt. If you want to read data that was created by an
-    earlier version of Qt, or write data that can be read by a
-    program that was compiled with an earlier version of Qt, use this
-    function to modify the serialization format used by QDataStream.
+    To accommodate new functionality, the datastream serialization
+    format of some Qt classes has changed in some versions of Qt. If
+    you want to read data that was created by an earlier version of
+    Qt, or write data that can be read by a program that was compiled
+    with an earlier version of Qt, use this function to modify the
+    serialization format used by QDataStream.
 
     \table
     \header \i Qt Version       \i QDataStream Version
+    \row \i Qt 4.6                  \i 12
+    \row \i Qt 4.5                  \i 11
     \row \i Qt 4.4                  \i 10
     \row \i Qt 4.3                  \i 9
     \row \i Qt 4.2                  \i 8