From df9ab6c300eca3a5c75dcee93ae848957cb9a617 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 19 May 2010 10:09:51 +1000
Subject: Only setup ICD test data when ICD is enabled.

Fixes unit test build failures introduced in
90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
---
 tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp    | 8 ++++----
 .../tst_qnetworkconfigurationmanager.cpp                          | 8 ++++----
 tests/auto/qnetworksession/test/tst_qnetworksession.cpp           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index a3cccb2..f714b04 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -52,7 +52,7 @@
 */
 #include <QNetworkAccessManager>
 
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -73,7 +73,7 @@ private slots:
     void isRoamingAvailable();
 
 private:
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     Maemo::IAPConf *iapconf;
     Maemo::IAPConf *iapconf2;
     Maemo::IAPConf *gprsiap;
@@ -85,7 +85,7 @@ private:
 
 void tst_QNetworkConfiguration::initTestCase()
 {
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf = new Maemo::IAPConf("007");
     iapconf->setValue("ipv4_type", "AUTO");
     iapconf->setValue("wlan_wepkey1", "connt");
@@ -158,7 +158,7 @@ void tst_QNetworkConfiguration::initTestCase()
 
 void tst_QNetworkConfiguration::cleanupTestCase()
 {
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf->clear();
     delete iapconf;
     iapconf2->clear();
diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
index 7cc527c..6dfc0b5 100644
--- a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
@@ -45,7 +45,7 @@
 #include <QtNetwork/qnetworkconfiguration.h>
 #include <QtNetwork/qnetworkconfigmanager.h>
 
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -67,7 +67,7 @@ private slots:
     void configurationFromIdentifier();
 
 private:
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     Maemo::IAPConf *iapconf;
     Maemo::IAPConf *iapconf2;
     Maemo::IAPConf *gprsiap;
@@ -79,7 +79,7 @@ private:
 
 void tst_QNetworkConfigurationManager::initTestCase()
 {
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf = new Maemo::IAPConf("007");
     iapconf->setValue("ipv4_type", "AUTO");
     iapconf->setValue("wlan_wepkey1", "connt");
@@ -153,7 +153,7 @@ void tst_QNetworkConfigurationManager::initTestCase()
 
 void tst_QNetworkConfigurationManager::cleanupTestCase()
 {
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf->clear();
     delete iapconf;
     iapconf2->clear();
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
index 934a50e..65fc1a8 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
@@ -48,7 +48,7 @@
 #include <QtNetwork/qnetworkconfigmanager.h>
 #include <QtNetwork/qnetworksession.h>
 
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -104,7 +104,7 @@ private:
 
     int inProcessSessionManagementCount;
 
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     Maemo::IAPConf *iapconf;
     Maemo::IAPConf *iapconf2;
     Maemo::IAPConf *gprsiap;
@@ -140,7 +140,7 @@ void tst_QNetworkSession::initTestCase()
     testsToRun["userChoiceSession"] = true;
     testsToRun["sessionOpenCloseStop"] = true;
 	
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf = new Maemo::IAPConf("007");
     iapconf->setValue("ipv4_type", "AUTO");
     iapconf->setValue("wlan_wepkey1", "connt");
@@ -226,7 +226,7 @@ void tst_QNetworkSession::cleanupTestCase()
                  "inProcessSessionManagement()");
     }
 
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
+#ifndef QT_NO_ICD
     iapconf->clear();
     delete iapconf;
     iapconf2->clear();
-- 
cgit v0.12