summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
diff options
context:
space:
mode:
authorAlex <qt-info@nokia.com>2009-12-15 19:22:55 +1000
committerAlex <qt-info@nokia.com>2009-12-15 19:22:55 +1000
commit513cadeb6ff5284176ef48820415c019d36abb5a (patch)
treedf950e3697603d56eeaed1b81daa3d8e53f49e04 /tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
parentb2a892569062a277cabe373e51b4508bd1bbc237 (diff)
distinguish Freemantle and Harmattan code
adds proper defines and CONFIG flags
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 796677d8f9..6ab0e6f747 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 MAEMO
+#ifdef Q_WS_MAEMO_6
#include <stdio.h>
#include <iapconf.h>
#endif
@@ -66,7 +66,7 @@ private slots:
void configurationFromIdentifier();
private:
-#ifdef MAEMO
+#ifdef Q_WS_MAEMO_6
Maemo::IAPConf *iapconf;
Maemo::IAPConf *iapconf2;
Maemo::IAPConf *gprsiap;
@@ -78,7 +78,7 @@ private:
void tst_QNetworkConfigurationManager::initTestCase()
{
-#ifdef MAEMO
+#ifdef Q_WS_MAEMO_6
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 MAEMO
+#ifdef Q_WS_MAEMO_6
iapconf->clear();
delete iapconf;
iapconf2->clear();