diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 09:43:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 09:43:37 (GMT) |
| commit | 30ffe43f826baae366b6e745d077ade316512d3b (patch) | |
| tree | 3e8c020ec99a5d69b9787a8d164a2f326936eebc /src/network/kernel | |
| parent | e7989aeb09f7c597edf3498183bd97bd0122382b (diff) | |
| parent | 99f6250a4ac031b70757442715b226bc339ab699 (diff) | |
| download | Qt-30ffe43f826baae366b6e745d077ade316512d3b.zip Qt-30ffe43f826baae366b6e745d077ade316512d3b.tar.gz Qt-30ffe43f826baae366b6e745d077ade316512d3b.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 2852d30..5ae3acc 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1097,7 +1097,7 @@ uint qHash(const QHostAddress &key) Writes host address \a address to the stream \a out and returns a reference to the stream. - \sa {Format of the QDataStream operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator<<(QDataStream &out, const QHostAddress &address) { @@ -1127,7 +1127,7 @@ QDataStream &operator<<(QDataStream &out, const QHostAddress &address) Reads a host address into \a address from the stream \a in and returns a reference to the stream. - \sa {Format of the QDataStream operators} + \sa {Serializing Qt Data Types} */ QDataStream &operator>>(QDataStream &in, QHostAddress &address) { |