diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2012-05-02 14:35:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 22:32:13 +0200 |
| commit | dac828dd810526a880ffdd6ef455b14af78f3e8e (patch) | |
| tree | db31899bc38c621633039195408a073307697701 /src/network | |
| parent | a195a5bfd6b1534968a785c539e4403d13ad722b (diff) | |
Android's resolv.h is busted, so stub out QHostInfo::localDomainName().
Change-Id: Idcf5ca7298eed55121b690906885af0eb3fe0b9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 71eb240812..b696265ee4 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -322,7 +322,7 @@ QString QHostInfo::localHostName() QString QHostInfo::localDomainName() { -#if !defined(Q_OS_VXWORKS) +#if !defined(Q_OS_VXWORKS) && !defined(Q_OS_LINUX_ANDROID) resolveLibrary(); if (local_res_ninit) { // using thread-safe version |