diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
| commit | d3b898e973662707f9644b4fe5f8d18849929723 (patch) | |
| tree | cf7644a23cc1787c1b710c7c1ebd0b6e028d3ca7 /src/network/kernel/qhostinfo_unix.cpp | |
| parent | a8030e0c543e538652605557843b845f89b11589 (diff) | |
| parent | 40b6c1dd9199ac5e0d6a1921b05c11e647d09dca (diff) | |
| download | Qt-d3b898e973662707f9644b4fe5f8d18849929723.zip Qt-d3b898e973662707f9644b4fe5f8d18849929723.tar.gz Qt-d3b898e973662707f9644b4fe5f8d18849929723.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/qhostinfo_unix.cpp')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 3112dd6..9e3da61 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -247,7 +247,10 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) #ifndef QT_NO_IPV6 else if (node->ai_family == AF_INET6) { QHostAddress addr; - addr.setAddress(((sockaddr_in6 *) node->ai_addr)->sin6_addr.s6_addr); + sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr; + addr.setAddress(sa6->sin6_addr.s6_addr); + if (sa6->sin6_scope_id) + addr.setScopeId(QString::number(sa6->sin6_scope_id)); if (!addresses.contains(addr)) addresses.append(addr); } |