diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-19 00:09:51 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-19 00:13:09 (GMT) |
| commit | df9ab6c300eca3a5c75dcee93ae848957cb9a617 (patch) | |
| tree | c3086d33f7399ada2b6bde84bc01f79bad0eba2e /tests/auto/qnetworkconfiguration | |
| parent | 49564fa573cd15b5a6e4673b8945af6a92717432 (diff) | |
| download | Qt-df9ab6c300eca3a5c75dcee93ae848957cb9a617.zip Qt-df9ab6c300eca3a5c75dcee93ae848957cb9a617.tar.gz Qt-df9ab6c300eca3a5c75dcee93ae848957cb9a617.tar.bz2 | |
Only setup ICD test data when ICD is enabled.
Fixes unit test build failures introduced in
90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
Diffstat (limited to 'tests/auto/qnetworkconfiguration')
| -rw-r--r-- | tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp | 8 |
1 files changed, 4 insertions, 4 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(); |