diff options
| author | Cristiano di Flora <cristiano.di-flora@nokia.com> | 2011-10-04 12:12:28 +0300 |
|---|---|---|
| committer | Cristiano di Flora <cristiano.di-flora@nokia.com> | 2011-10-04 12:12:28 +0300 |
| commit | 1a91802198ae4954c2c13a813e312649a217e867 (patch) | |
| tree | a5dc0289e80282c67812b5b3561738315b74ab33 /tests | |
| parent | e3f3cc6336aeecc4d36dc9e44c45b9ec2920beaf (diff) | |
| parent | a72b05efbbdd6267bfb84f738f52d263ddf1ef1b (diff) | |
Merge commit 'refs/merge-requests/36' of git://gitorious.org/qt-mobility/qt-mobility into merge-requests/36
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 |