summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
diff options
context:
space:
mode:
authorAlex <qt-info@nokia.com>2010-03-18 18:07:02 +1000
committerAlex <qt-info@nokia.com>2010-03-18 18:07:02 +1000
commit099ccea327de581f68a74cdf81203a029d6c0ee5 (patch)
tree32975f02770a5ac8132e126a5ce37159cbdb907d /tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
parenta554a3bf57731dcfc81146216badf253929397e6 (diff)
Maemo5 has exact same bearer code base as Maemo6. Make sure that the
ifdefs match up
Diffstat (limited to 'tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp')
-rw-r--r--tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
index 6ab0e6f747..9a24da056e 100644
--- a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
+++ b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
@@ -44,7 +44,7 @@
#include "qnetworkconfiguration.h"
#include "qnetworkconfigmanager.h"
-#ifdef Q_WS_MAEMO_6
+#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
#include <stdio.h>
#include <iapconf.h>
#endif
@@ -66,7 +66,7 @@ private slots:
void configurationFromIdentifier();
private:
-#ifdef Q_WS_MAEMO_6
+#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
Maemo::IAPConf *iapconf;
Maemo::IAPConf *iapconf2;
Maemo::IAPConf *gprsiap;
@@ -78,7 +78,7 @@ private:
void tst_QNetworkConfigurationManager::initTestCase()
{
-#ifdef Q_WS_MAEMO_6
+#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
iapconf = new Maemo::IAPConf("007");
iapconf->setValue("ipv4_type", "AUTO");
iapconf->setValue("wlan_wepkey1", "connt");
@@ -152,7 +152,7 @@ void tst_QNetworkConfigurationManager::initTestCase()
void tst_QNetworkConfigurationManager::cleanupTestCase()
{
-#ifdef Q_WS_MAEMO_6
+#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
iapconf->clear();
delete iapconf;
iapconf2->clear();