diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-19 10:09:51 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-19 10:13:09 +1000 |
| commit | df9ab6c300eca3a5c75dcee93ae848957cb9a617 (patch) | |
| tree | c3086d33f7399ada2b6bde84bc01f79bad0eba2e /tests/auto/qnetworksession | |
| parent | 49564fa573cd15b5a6e4673b8945af6a92717432 (diff) | |
Only setup ICD test data when ICD is enabled.
Fixes unit test build failures introduced in
90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
Diffstat (limited to 'tests/auto/qnetworksession')
| -rw-r--r-- | tests/auto/qnetworksession/test/tst_qnetworksession.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp index 934a50e3bd..65fc1a8330 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(); |