diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-13 09:33:02 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-13 09:33:02 (GMT) |
| commit | e305732c0df93332a514a957b08e0ce283cb747f (patch) | |
| tree | 603522227e5d4e9f2994408afd5d5523951ba648 /src/network | |
| parent | c93c9bbfe94cd271aeda9e2730d343e3eee31ec5 (diff) | |
| parent | a296749eaea94ae4ed36086b632d32c87d3d99c9 (diff) | |
| download | Qt-e305732c0df93332a514a957b08e0ce283cb747f.zip Qt-e305732c0df93332a514a957b08e0ce283cb747f.tar.gz Qt-e305732c0df93332a514a957b08e0ce283cb747f.tar.bz2 | |
Fixing merge conflicts.
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 5ae3acc..0bacf90 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -428,9 +428,9 @@ void QNetmaskAddress::setPrefixLength(QAbstractSocket::NetworkLayerProtocol prot QHostAddress is normally used with the QTcpSocket, QTcpServer, and QUdpSocket to connect to a host or to set up a server. - A host address is set with setAddress(), checked for its type - using isIPv4Address() or isIPv6Address(), and retrieved with - toIPv4Address(), toIPv6Address(), or toString(). + A host address is set with setAddress(), and retrieved with + toIPv4Address(), toIPv6Address(), or toString(). You can check the + type with protocol(). \note Please note that QHostAddress does not do DNS lookups. QHostInfo is needed for that. @@ -679,7 +679,8 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr) For example, if the address is 127.0.0.1, the returned value is 2130706433 (i.e. 0x7f000001). - This value is only valid if isIp4Addr() returns true. + This value is only valid if the Protocol() is + \l{QAbstractSocket::}{IPv4Protocol}. \sa toString() */ @@ -704,7 +705,8 @@ QAbstractSocket::NetworkLayerProtocol QHostAddress::protocol() const \snippet doc/src/snippets/code/src_network_kernel_qhostaddress.cpp 0 - This value is only valid if isIPv6Address() returns true. + This value is only valid if the protocol() is + \l{QAbstractSocket::}{IPv6Protocol}. \sa toString() */ |