diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
| commit | ba2cc78943678173d21a4339839e63d16fe774a9 (patch) | |
| tree | 691ac2916d5daf948cdac07bc4ef19d08f36cabd /src/network/kernel/qhostaddress.cpp | |
| parent | 8f47373e3795d7ec50387d5f1a771a59567bdaea (diff) | |
| parent | ef8cd7f2e68d6d34d70c3a12e82a67ed16b92b72 (diff) | |
| download | Qt-ba2cc78943678173d21a4339839e63d16fe774a9.zip Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.gz Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/network/kernel/qhostaddress.cpp')
| -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) { |