From 4ccc8d2fd1c6ae51d2459e80f655a2c2ac60e3c0 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 19 May 2010 16:22:47 +1000
Subject: Fix build on Mac OS X and Windows.

---
 configure                                                         | 2 +-
 tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp    | 8 ++++----
 .../tst_qnetworkconfigurationmanager.cpp                          | 8 ++++----
 tests/auto/qnetworksession/test/tst_qnetworksession.cpp           | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index d357fde..acd218e 100755
--- a/configure
+++ b/configure
@@ -7517,7 +7517,7 @@ fi
 [ "$CFG_ALSA" = "no" ]           && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA"
 [ "$CFG_PULSEAUDIO" = "no" ]          && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO"
 [ "$CFG_COREWLAN" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
-[ "$CFG_ICD" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD"
+[ "$CFG_ICD" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD"
 
 # sort QCONFIG_FLAGS for neatness if we can
 [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index f714b04..e66719a 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -52,7 +52,7 @@
 */
 #include <QNetworkAccessManager>
 
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -73,7 +73,7 @@ private slots:
     void isRoamingAvailable();
 
 private:
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
     Maemo::IAPConf *iapconf;
     Maemo::IAPConf *iapconf2;
     Maemo::IAPConf *gprsiap;
@@ -85,7 +85,7 @@ private:
 
 void tst_QNetworkConfiguration::initTestCase()
 {
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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()
 {
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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 6dfc0b5..c732a5b 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>
 
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -67,7 +67,7 @@ private slots:
     void configurationFromIdentifier();
 
 private:
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
     Maemo::IAPConf *iapconf;
     Maemo::IAPConf *iapconf2;
     Maemo::IAPConf *gprsiap;
@@ -79,7 +79,7 @@ private:
 
 void tst_QNetworkConfigurationManager::initTestCase()
 {
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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()
 {
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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 65fc1a8..e4f2486 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>
 
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
 #include <stdio.h>
 #include <iapconf.h>
 #endif
@@ -104,7 +104,7 @@ private:
 
     int inProcessSessionManagementCount;
 
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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;
 	
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(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()");
     }
 
-#ifndef QT_NO_ICD
+#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD)
     iapconf->clear();
     delete iapconf;
     iapconf2->clear();
-- 
cgit v0.12