diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
| commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
| tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /doc/src/files-and-resources/datastreamformat.qdoc | |
| parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'doc/src/files-and-resources/datastreamformat.qdoc')
| -rw-r--r-- | doc/src/files-and-resources/datastreamformat.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/files-and-resources/datastreamformat.qdoc b/doc/src/files-and-resources/datastreamformat.qdoc index bab2c2c..c4be7bb 100644 --- a/doc/src/files-and-resources/datastreamformat.qdoc +++ b/doc/src/files-and-resources/datastreamformat.qdoc @@ -41,7 +41,8 @@ /*! \page datastreamformat.html - \title Format of the QDataStream Operators + \title Serializing Qt Data Types + \ingroup qt-network \brief Representations of data types that can be serialized by QDataStream. The \l QDataStream allows you to serialize some of the Qt data types. |