diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-03-25 09:30:17 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2011-03-25 09:44:05 (GMT) |
| commit | 10d81f9a815f889ebf693f89eaf381299d7ccfc2 (patch) | |
| tree | 2422001815fe1662ce21e458d6d6aad2bb0feeb7 | |
| parent | 7d3832891e8229051d7ddc420cd0a323a4f5d17a (diff) | |
| download | Qt-10d81f9a815f889ebf693f89eaf381299d7ccfc2.zip Qt-10d81f9a815f889ebf693f89eaf381299d7ccfc2.tar.gz Qt-10d81f9a815f889ebf693f89eaf381299d7ccfc2.tar.bz2 | |
QHostInfo: Don't mess with addr family ordering
Reviewed-by: Aaron Tunney
| -rw-r--r-- | src/network/kernel/qhostinfo_symbian.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/network/kernel/qhostinfo_symbian.cpp b/src/network/kernel/qhostinfo_symbian.cpp index 5998a72..02bef40 100644 --- a/src/network/kernel/qhostinfo_symbian.cpp +++ b/src/network/kernel/qhostinfo_symbian.cpp @@ -160,13 +160,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetw // Ensure that record is valid (not an alias and with length greater than 0) if (!(nameResult().iFlags & TNameRecord::EAlias) && (ipAddr.Length() > 0)) { - if (nameResult().iAddr.Family() == KAfInet) { - // IPv4 - prepend - hostAddresses.prepend(QHostAddress(qt_TDesC2QString(ipAddr))); - } else { - // IPv6 - append - hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); - } + hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); } } @@ -389,13 +383,7 @@ void QSymbianHostResolver::processNameResults() // Ensure that record is valid (not an alias and with length greater than 0) if (!(iNameResult().iFlags & TNameRecord::EAlias) && (ipAddr.Length() > 0)) { - if (iNameResult().iAddr.Family() == KAfInet) { - // IPv4 - prepend - hostAddresses.prepend(QHostAddress(qt_TDesC2QString(ipAddr))); - } else { - // IPv6 - append - hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); - } + hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); } } |