diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-12 03:52:25 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-12 03:52:25 +1000 |
| commit | f879fd533f6d919653f86d762e9eb5baa5d9731e (patch) | |
| tree | bd1775f514bbb96028c7c2025cb1f21d3b01b0e0 /tests | |
| parent | fad7ea743108a331b684c00d75722449273c08d1 (diff) | |
| parent | 3823dd2a94ed4a48a2e41cf141d971244410a2dd (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-bearermanagement into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-bearermanagement:
Fix a symbian build break due to refactoring in bearer mgmt api.
Restore bearer_old.pro.
Replace QtBearer implementation with a shim over QtNetwork
Diffstat (limited to 'tests')
7 files changed, 9 insertions, 15 deletions
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro index 87dc1f3f00..1d023f2c7b 100644 --- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro +++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro @@ -5,8 +5,6 @@ CONFIG += testcase QT = core network -INCLUDEPATH += ../../../src/bearer - include(../../../common.pri) CONFIG += mobility MOBILITY = bearer diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp index 899f728c3a..52304c4e98 100644 --- a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp +++ b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp @@ -43,8 +43,8 @@ #include <QtTest/QtTest> #include "../qbearertestcommon.h" -#include "../../../src/bearer/qnetworkconfiguration.h" -#include "../../../src/bearer/qnetworkconfigmanager.h" +#include <QNetworkConfiguration> +#include <QNetworkConfigurationManager> #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5) #include <stdio.h> diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro index ca11aaf61a..e228a413e1 100644 --- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro @@ -5,8 +5,6 @@ CONFIG += testcase QT = core network -INCLUDEPATH += ../../../src/bearer - include(../../../common.pri) CONFIG += mobility MOBILITY = bearer diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp index e3c17ffde8..5c23ea87d4 100644 --- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp +++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp @@ -43,8 +43,8 @@ #include <QtTest/QtTest> #include "../qbearertestcommon.h" -#include "../../../src/bearer/qnetworkconfiguration.h" -#include "../../../src/bearer/qnetworkconfigmanager.h" +#include <QNetworkConfiguration> +#include <QNetworkConfigurationManager> /* Although this unit test doesn't use QNetworkAccessManager diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp index 0fa666f0a9..ac57c465ec 100644 --- a/tests/auto/qnetworksession/lackey/main.cpp +++ b/tests/auto/qnetworksession/lackey/main.cpp @@ -42,9 +42,9 @@ #include <QCoreApplication> #include <QStringList> #include <QLocalSocket> -#include "../../../../src/bearer/qnetworkconfigmanager.h" -#include "../../../../src/bearer/qnetworkconfiguration.h" -#include "../../../../src/bearer/qnetworksession.h" +#include <QNetworkConfigurationManager> +#include <QNetworkConfiguration> +#include <QNetworkSession> #include <QEventLoop> #include <QTimer> diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp index 5729d87fa6..5ea9812e65 100644 --- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp +++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp @@ -46,8 +46,8 @@ #include <QLocalSocket> #include <QTimer> #include "../../qbearertestcommon.h" -#include "../../../../src/bearer/qnetworkconfigmanager.h" -#include "../../../../src/bearer/qnetworksession.h" +#include <QNetworkConfigurationManager> +#include <QNetworkSession> #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5) #include <stdio.h> diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro index 06067e4d7d..1ca0d803cc 100644 --- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro +++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro @@ -5,8 +5,6 @@ CONFIG += testcase QT = core network -INCLUDEPATH += ../../../../src/bearer - include(../../../../common.pri) CONFIG += mobility MOBILITY = bearer |