Android's resolv.h is busted, so stub out QHostInfo::localDomainName().
authorRobin Burchell <robin.burchell@collabora.co.uk>
Wed, 2 May 2012 12:35:54 +0000 (14:35 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 2 May 2012 20:32:13 +0000 (22:32 +0200)
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

index 71eb240..b696265 100644 (file)
@@ -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