diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
| commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
| tree | a67e82fde179fa727172fff9098758d60912189d /src/network/kernel/qhostinfo_unix.cpp | |
| parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
| parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) | |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'src/network/kernel/qhostinfo_unix.cpp')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index cf08a15f96..9a24938284 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -150,8 +150,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) QHostAddress address; if (address.setAddress(hostName)) { // Reverse lookup -// Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead. -#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) +#if !defined (QT_NO_GETADDRINFO) sockaddr_in sa4; sockaddr_in6 sa6; sockaddr *sa = 0; |