summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkconfigmanager
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-04 23:06:49 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-04 23:45:12 (GMT)
commit31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41 (patch)
tree0f013fe0a7407737aac96d8d0dab5ccf83815261 /tests/auto/qnetworkconfigmanager
parent0f31f63e11d4fcb2b399979de28368a89275b911 (diff)
downloadQt-31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41.zip
Qt-31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41.tar.gz
Qt-31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41.tar.bz2
Bearer Management Integration 2.
Diffstat (limited to 'tests/auto/qnetworkconfigmanager')
-rw-r--r--tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro3
-rw-r--r--tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp8
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
index 0b2ed1a..bdd4926 100644
--- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
+++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
@@ -8,7 +8,8 @@ QT = core network
INCLUDEPATH += ../../../src/bearer
include(../../../common.pri)
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
symbian {
TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
index 796677d..6ab0e6f 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();