summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-12 08:12:44 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-12 08:12:44 (GMT)
commit0cd421df59a25c5c3395d5e12c0a5842dc035ed0 (patch)
tree105e1f4a8a1c0fef983f5001e2db5ab6378cf7fb /doc
parente12a03d59aebcf2d5b304d02bb6fada3e3300450 (diff)
parent0cfe640f20a7f427d4da79386cbd8cd18481c019 (diff)
downloadQt-0cd421df59a25c5c3395d5e12c0a5842dc035ed0.zip
Qt-0cd421df59a25c5c3395d5e12c0a5842dc035ed0.tar.gz
Qt-0cd421df59a25c5c3395d5e12c0a5842dc035ed0.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc')
-rw-r--r--doc/src/snippets/code/src_corelib_io_qdatastream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_io_qdatastream.cpp b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
index fd6d564..c1f3469 100644
--- a/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
@@ -5,7 +5,7 @@ void wrapInFunction()
QFile file("file.dat");
file.open(QIODevice::WriteOnly);
QDataStream out(&file); // we will serialize the data into the file
-out << "the answer is"; // serialize a string
+out << QString("the answer is"); // serialize a string
out << (qint32)42; // serialize an integer
//! [0]