Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c

1 files changed, 11 insertions, 5 deletions

diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 484dcbf22e..da38f8ae21 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -817,8 +817,12 @@ QDataStream &QDataStream::operator>>(double &f)
     Reads the '\\0'-terminated string \a s from the stream and returns
     a reference to the stream.
 
-    Space for the string is allocated using \c new -- the caller must
-    destroy it with \c{delete[]}.
+    The string is deserialized using \c{readBytes()}.
+
+    Space for the string is allocated using \c{new []} -- the caller must
+    destroy it with \c{delete []}.
+
+    \sa readBytes(), readRawData()
 */
 
 QDataStream &QDataStream::operator>>(char *&s)
@@ -832,8 +836,8 @@ QDataStream &QDataStream::operator>>(char *&s)
     Reads the buffer \a s from the stream and returns a reference to
     the stream.
 
-    The buffer \a s is allocated using \c new. Destroy it with the \c
-    delete[] operator.
+    The buffer \a s is allocated using \c{new []}. Destroy it with the
+    \c{delete []} operator.
 
     The \a l parameter is set to the length of the buffer. If the
     string read is empty, \a l is set to 0 and \a s is set to
@@ -1102,7 +1106,9 @@ QDataStream &QDataStream::operator<<(double f)
     Writes the '\\0'-terminated string \a s to the stream and returns a
     reference to the stream.
 
-    The string is serialized using writeBytes().
+    The string is serialized using \c{writeBytes()}.
+
+    \sa writeBytes(), writeRawData()
 */
 
 QDataStream &QDataStream::operator<<(const char *s)