From 8de706d342b31b863e9e7b8eb222a0cb2ab57054 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Tue, 16 Jun 2009 14:44:59 +0300
Subject: Fix Qt network autotest compilation for ARMV5.

The build was broken by commit:

7604f8087f88171ef933d8ae08f501467e647338
---
 tests/auto/network-settings.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 0924c57..01a732c 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -50,7 +50,8 @@
 #include <QSharedPointer>
 #include <QHash>
 #endif
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+#if defined(Q_OS_SYMBIAN)
+#if 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.
@@ -59,6 +60,7 @@
 // network tests. WINPCAP connectivity uses Symbian OS IP stack,
 // correspondingly as HW does. When using WINPCAP disable this define
 //#define SYMBIAN_WINSOCK_CONNECTIVITY
+#endif // Q_CC_NOKIAX86
 
 class QtNetworkSettingsRecord {
 public:
@@ -80,7 +82,7 @@ private:
     QString strRecordValue;
 };
 
-#endif
+#endif // Q_OS_SYMBIAN
 
 class QtNetworkSettings
 {
-- 
cgit v0.12