14 files changed, 14 insertions, 81 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d5d72a7..176cc3a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -434,7 +434,10 @@ SUBDIRS += \
            qmargins \
            qnetworkaddressentry \
            qnetworkcachemetadata \
+           qnetworkconfigmanager \
+           qnetworkconfiguration \
            qnetworkdiskcache \
+           qnetworksession \
            qobjectperformance \
            qpainterpathstroker \
            qplugin \
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
index 0b2ed1a..b539dd3 100644
--- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
+++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
@@ -1,15 +1,5 @@
+load(qttest_p4)
 SOURCES  += tst_qnetworkconfigmanager.cpp
 HEADERS  += ../qbearertestcommon.h
-TARGET = tst_qnetworkconfigurationmanager
-CONFIG += testcase
 
 QT = core network
-
-INCLUDEPATH += ../../../src/bearer
-
-include(../../../common.pri)
-qtAddLibrary(QtBearer)
-
-symbian {
-    TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
index 796677d..f92704d 100644
--- a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
+++ b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
@@ -49,7 +49,7 @@
 #include <iapconf.h>
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QNetworkConfigurationManager : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
index 61e4097..078983d 100644
--- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -1,15 +1,5 @@
+load(qttest_p4)
 SOURCES  += tst_qnetworkconfiguration.cpp
 HEADERS  += ../qbearertestcommon.h
-TARGET = tst_qnetworkconfiguration
-CONFIG += testcase
 
 QT = core network
-
-INCLUDEPATH += ../../../src/bearer
-
-include(../../../common.pri)
-qtAddLibrary(QtBearer)
-
-symbian {
-    TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData 
-}
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index cbb13f3..ac0f054 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -49,7 +49,7 @@
 #include <iapconf.h>
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QNetworkConfiguration : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index 4cb8555..ccbdd98 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -1,12 +1,4 @@
+load(qttest_p4)
 SOURCES += main.cpp
-TARGET = qnetworksessionlackey
-INCLUDEPATH += ../../../../src/bearer
-DEPENDPATH += ../../../../src/bearer
 
 QT = core network
-
-CONFIG+= testcase
-
-include(../../../../common.pri)
-
-qtAddLibrary(QtBearer)
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index 53f6f4f..8190292 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.cpp
@@ -48,7 +48,7 @@
 
 #include <QDebug>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 
 #define NO_DISCOVERED_CONFIGURATIONS_ERROR 1
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
index cbd4c8f..b5935e1 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
@@ -51,7 +51,7 @@
 #include <iapconf.h>
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 Q_DECLARE_METATYPE(QNetworkSession::State);
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index 1410601..bf33122 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -1,21 +1,5 @@
+load(qttest_p4)
 SOURCES  += tst_qnetworksession.cpp
 HEADERS  += ../../qbearertestcommon.h
-TARGET = tst_qnetworksession
-CONFIG += testcase
 
 QT = core network
-
-INCLUDEPATH += ../../../../src/bearer
-
-include(../../../../common.pri)
-qtAddLibrary(QtBearer)
-
-wince* {
-    LACKEY.sources = $$OUTPUT_DIR/build/tests/bin/qnetworksessionlackey.exe
-    LACKEY.path = .
-    DEPLOYMENT += LACKEY
-}
-
-symbian {
-    TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h
index f18180e..04da6ca 100644
--- a/tests/manual/bearerex/bearerex.h
+++ b/tests/manual/bearerex/bearerex.h
@@ -54,7 +54,7 @@
 class QHttp;
 class SessionTab;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class BearerEx : public QMainWindow, public Ui::BearerExMainWindow
 {
diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro
index a870eb1..476e87c 100644
--- a/tests/manual/bearerex/bearerex.pro
+++ b/tests/manual/bearerex/bearerex.pro
@@ -8,13 +8,6 @@ QT += core \
 FORMS += sessiondialog.ui \
          bearerex.ui \
          detailedinfodialog.ui
-include(../../common.pri)
-#not really a test case but deployment happens same way
-CONFIG += testcase
-
-DEPENDPATH += .
-INCLUDEPATH += . \
-               ../../src/bearer
 
 # Example headers and sources
 HEADERS += bearerex.h \
@@ -23,12 +16,3 @@ HEADERS += bearerex.h \
 SOURCES += bearerex.cpp \
            main.cpp \
            xqlistwidget.cpp
-
-symbian: {
-    bearerex.sources = Qtbearer.dll
-    bearerex.path = /sys/bin
-    DEPLOYMENT += bearerex
-
-    TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
-qtAddLibrary(QtBearer)
diff --git a/tests/manual/networkmanager/networkmanager.pro b/tests/manual/networkmanager/networkmanager.pro
index 31b2af1..84289d3 100644
--- a/tests/manual/networkmanager/networkmanager.pro
+++ b/tests/manual/networkmanager/networkmanager.pro
@@ -4,16 +4,6 @@ TARGET = tst_networkmanagertest
 
 QT = core network dbus gui
 
-#not really a test case but deployment happens same way
-CONFIG += testcase
-
 requires(contains(QT_CONFIG,dbus))
 
-INCLUDEPATH += ../../src/bearer
-include(../../common.pri)
-
-qtAddLibrary(QtBearer)
-
-#MOC_DIR = .moc
-#OBJECTS_DIR = .obj
 FORMS += dialog.ui
diff --git a/tests/manual/networkmanager/nmview.cpp b/tests/manual/networkmanager/nmview.cpp
index ca9d907..35a0204 100644
--- a/tests/manual/networkmanager/nmview.cpp
+++ b/tests/manual/networkmanager/nmview.cpp
@@ -68,7 +68,7 @@
 #include <qnetworkconfiguration.h>
 #include <qnetworkconfigmanager.h>
 #include <qnetworksession.h>
-#include <qnetworkmanagerservice_p.h>
+#include <QtNetwork/private/qnetworkmanagerservice_p.h>
 
 //static QDBusConnection dbc = QDBusConnection::systemBus();
 //typedef QMap< QString, QMap<QString,QVariant> > SettingsMap;
diff --git a/tests/manual/networkmanager/nmview.h b/tests/manual/networkmanager/nmview.h
index 641385e..7db56d4 100644
--- a/tests/manual/networkmanager/nmview.h
+++ b/tests/manual/networkmanager/nmview.h
@@ -47,7 +47,7 @@
 
 #include "ui_dialog.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QListWidget;
 class QTreeWidget;