From dac828dd810526a880ffdd6ef455b14af78f3e8e Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.co.uk>
Date: Wed, 2 May 2012 14:35:54 +0200
Subject: 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>
---
 src/network/kernel/qhostinfo_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.3