diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 05:05:41 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 05:05:41 (GMT) |
| commit | c9a68d0c2b83d67359d153e0323b10147ef9b2e0 (patch) | |
| tree | c2121c6d7e129cd30e7496e98013ab41e0d00422 /tests/auto/qnetworkconfiguration | |
| parent | 31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41 (diff) | |
| parent | ca7fe1713ff82dcde8fb2fdfb0664b5dfa830bd7 (diff) | |
| download | Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.zip Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.gz Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.bz2 | |
Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2
Conflicts:
config.tests/mac/corewlan/corewlan.pro
examples/network/bearercloud/bearercloud.pro
examples/network/bearermonitor/bearermonitor.pro
src/network/bearer/bearer.pro
src/network/bearer/qnativewifiengine_win.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/bearer/qnetworkconfiguration_s60_p.cpp
src/network/bearer/qnetworksession.cpp
src/network/bearer/qnetworksession_p.cpp
src/network/bearer/qnmwifiengine_unix.cpp
src/network/bearer/qnmwifiengine_unix_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/bearer/generic/qgenericengine.cpp
src/plugins/bearer/nla/main.cpp
src/plugins/bearer/nla/qnlaengine.cpp
tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
tests/auto/qnetworksession/lackey/lackey.pro
tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
tests/manual/bearerex/bearerex.pro
tests/manual/networkmanager/networkmanager.pro
Diffstat (limited to 'tests/auto/qnetworkconfiguration')
| -rw-r--r-- | tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro | 9 | ||||
| -rw-r--r-- | tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro index c5a08b3..ce11cc7 100644 --- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro @@ -1,16 +1,9 @@ +load(qttest_p4) SOURCES += tst_qnetworkconfiguration.cpp HEADERS += ../qbearertestcommon.h -TARGET = tst_qnetworkconfiguration -CONFIG += testcase QT = core network -INCLUDEPATH += ../../../src/bearer - -include(../../../common.pri) -CONFIG += mobility -MOBILITY = bearer - symbian { TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData } diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp index e929a61..70f4447 100644 --- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp +++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -49,7 +49,7 @@ #include <iapconf.h> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QNetworkConfiguration : public QObject { Q_OBJECT |