From 31014eeeb8b994eeddc504636135682f77c7e4a6 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 26 May 2009 09:34:02 +0300
Subject: Commented out include that was needed only by commented out code and
 causing build problems for symbian.

---
 tests/auto/network-settings.h | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 88e9fb7..22d8886 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -37,7 +37,12 @@
 **
 ****************************************************************************/
 #include <QString>
+
+/*
+#ifdef QT_NETWORK_LIB
 #include <QtNetwork/QHostInfo>
+#endif
+*/
 
 #ifdef Q_OS_SYMBIAN
 #include <sys/socket.h>
@@ -48,10 +53,10 @@
 #if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
 // In emulator we use WINSOCK connectivity by default. Unfortunately winsock
 // does not work very well with UDP sockets. This defines skips some test
-// cases which have known problems. 
+// cases which have known problems.
 
 // NOTE: Prefer to use WINPCAP based connectivity in S60 emulator when running
-// network tests. WINPCAP connectivity uses Symbian OS IP stack, 
+// network tests. WINPCAP connectivity uses Symbian OS IP stack,
 // correspondingly as HW does. When using WINPCAP disable this define
 //#define SYMBIAN_WINSOCK_CONNECTIVITY
 #endif
@@ -138,7 +143,7 @@ public:
 #endif
         return "10.10.14.172";
     }
-    
+
     static QByteArray expectedReplyIMAP()
     {
 #ifdef Q_OS_SYMBIAN
@@ -160,7 +165,7 @@ public:
         QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " );
         expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
         expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
-        
+
         return expected;
     }
 
@@ -182,12 +187,12 @@ public:
             return expected;
         }
     }
-    
+
     static QByteArray expectedReplyFtp()
     {
         QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" );
         return expected;
-    }    
+    }
 
 #ifdef Q_OS_SYMBIAN
     static void setDefaultIap()
@@ -250,7 +255,7 @@ private:
                     position += QString("=").length();
 
                     //create record
-                    QtNetworkSettingsRecord *entry = 
+                    QtNetworkSettingsRecord *entry =
                         new QtNetworkSettingsRecord( QString("iap.default"), line.mid(position).trimmed() );
                     entries.insert(entry->recordName(), entry);
                     break;
-- 
cgit v0.12