summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/network/bearercloud/bearercloud.h2
-rw-r--r--examples/network/bearercloud/bearercloud.pro18
-rw-r--r--examples/network/bearercloud/cloud.h2
-rw-r--r--examples/network/bearermonitor/bearermonitor.h2
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro24
-rw-r--r--examples/network/bearermonitor/sessionwidget.h2
-rw-r--r--examples/network/network.pro4
-rw-r--r--src/network/bearer/bearer.pri130
-rw-r--r--src/network/bearer/qcorewlanengine_mac.mm4
-rw-r--r--src/network/bearer/qcorewlanengine_mac_p.h5
-rw-r--r--src/network/bearer/qgenericengine.cpp4
-rw-r--r--src/network/bearer/qgenericengine_p.h4
-rw-r--r--src/network/bearer/qnativewifiengine_win.cpp4
-rw-r--r--src/network/bearer/qnativewifiengine_win_p.h4
-rw-r--r--src/network/bearer/qnetworkconfigmanager.cpp4
-rw-r--r--src/network/bearer/qnetworkconfigmanager.h8
-rw-r--r--src/network/bearer/qnetworkconfigmanager_maemo.cpp4
-rw-r--r--src/network/bearer/qnetworkconfigmanager_maemo_p.h4
-rw-r--r--src/network/bearer/qnetworkconfigmanager_p.cpp4
-rw-r--r--src/network/bearer/qnetworkconfigmanager_p.h4
-rw-r--r--src/network/bearer/qnetworkconfigmanager_s60_p.cpp4
-rw-r--r--src/network/bearer/qnetworkconfigmanager_s60_p.h4
-rw-r--r--src/network/bearer/qnetworkconfiguration.cpp4
-rw-r--r--src/network/bearer/qnetworkconfiguration.h9
-rw-r--r--src/network/bearer/qnetworkconfiguration_maemo_p.h4
-rw-r--r--src/network/bearer/qnetworkconfiguration_p.h4
-rw-r--r--src/network/bearer/qnetworkconfiguration_s60_p.cpp4
-rw-r--r--src/network/bearer/qnetworkconfiguration_s60_p.h4
-rw-r--r--src/network/bearer/qnetworkmanagerservice_p.cpp4
-rw-r--r--src/network/bearer/qnetworkmanagerservice_p.h13
-rw-r--r--src/network/bearer/qnetworksession.cpp4
-rw-r--r--src/network/bearer/qnetworksession.h8
-rw-r--r--src/network/bearer/qnetworksession_maemo.cpp4
-rw-r--r--src/network/bearer/qnetworksession_maemo_p.h4
-rw-r--r--src/network/bearer/qnetworksession_p.cpp4
-rw-r--r--src/network/bearer/qnetworksession_p.h5
-rw-r--r--src/network/bearer/qnetworksession_s60_p.cpp4
-rw-r--r--src/network/bearer/qnetworksession_s60_p.h4
-rw-r--r--src/network/bearer/qnetworksessionengine.cpp4
-rw-r--r--src/network/bearer/qnetworksessionengine_p.h5
-rw-r--r--src/network/bearer/qnlaengine_win.cpp4
-rw-r--r--src/network/bearer/qnlaengine_win_p.h4
-rw-r--r--src/network/bearer/qnmdbushelper.cpp4
-rw-r--r--src/network/bearer/qnmdbushelper_p.h5
-rw-r--r--src/network/bearer/qnmwifiengine_unix.cpp10
-rw-r--r--src/network/bearer/qnmwifiengine_unix_p.h4
-rw-r--r--src/network/network.pro1
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro12
-rw-r--r--tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp2
-rw-r--r--tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro12
-rw-r--r--tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp2
-rw-r--r--tests/auto/qnetworksession/lackey/lackey.pro10
-rw-r--r--tests/auto/qnetworksession/lackey/main.cpp2
-rw-r--r--tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp2
-rw-r--r--tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro18
-rw-r--r--tests/manual/bearerex/bearerex.h2
-rw-r--r--tests/manual/bearerex/bearerex.pro16
-rw-r--r--tests/manual/networkmanager/networkmanager.pro10
-rw-r--r--tests/manual/networkmanager/nmview.cpp2
-rw-r--r--tests/manual/networkmanager/nmview.h2
61 files changed, 245 insertions, 219 deletions
diff --git a/examples/network/bearercloud/bearercloud.h b/examples/network/bearercloud/bearercloud.h
index c18ffd3..79b441f 100644
--- a/examples/network/bearercloud/bearercloud.h
+++ b/examples/network/bearercloud/bearercloud.h
@@ -45,7 +45,7 @@
#include <QMap>
#include <QHash>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class Cloud;
diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro
index 308ddda..c45d62a 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/network/bearercloud/bearercloud.pro
@@ -10,21 +10,3 @@ RESOURCES = icons.qrc
TARGET = bearercloud
QT = core gui network svg
-
-INCLUDEPATH += ../../src/bearer
-
-include(../examples.pri)
-
-qtAddLibrary(QtBearer)
-
-CONFIG += console
-
-include(../examples.pri)
-
-
-macx: {
- contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
- INCLUDEPATH += ../../
- contains(CONFIG, debug) {
- }
-}
diff --git a/examples/network/bearercloud/cloud.h b/examples/network/bearercloud/cloud.h
index 4ce43df..f844725 100644
--- a/examples/network/bearercloud/cloud.h
+++ b/examples/network/bearercloud/cloud.h
@@ -43,7 +43,7 @@
#include <qnetworksession.h>
#include <QGraphicsItem>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class QGraphicsTextItem;
class QGraphicsSvgItem;
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index d1f4601..9306d90 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -50,7 +50,7 @@
#include "ui_bearermonitor_640_480.h"
#endif
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class SessionWidget;
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index c8fb3c2..a854b55 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -4,7 +4,7 @@ HEADERS = sessionwidget.h \
SOURCES = main.cpp \
bearermonitor.cpp \
sessionwidget.cpp
-
+
FORMS = bearermonitor_240_320.ui \
bearermonitor_640_480.ui \
sessionwidget.ui
@@ -13,20 +13,10 @@ TARGET = bearermonitor
QT = core gui network
-INCLUDEPATH += ../../src/bearer
-
-include(../examples.pri)
-
-qtAddLibrary(QtBearer)
-win32:!wince*:LIBS += -lWs2_32
-wince*:LIBS += -lWs2
-
-CONFIG += console
-
-include(../examples.pri)
-
-macx: {
- contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
- contains(CONFIG, debug) {
- }
+win32 {
+ !wince* {
+ LIBS += -lWs2_32
+ } else {
+ LIBS += -lWs2
+ }
}
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index cb6591e..8bc60e4 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -46,7 +46,7 @@
#include <qnetworksession.h>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class SessionWidget : public QWidget, public Ui_SessionWidget
{
diff --git a/examples/network/network.pro b/examples/network/network.pro
index c5a97fb..bd632b8 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -11,7 +11,9 @@ SUBDIRS = blockingfortuneclient \
loopback \
threadedfortuneserver \
googlesuggest \
- torrent
+ torrent \
+ bearercloud \
+ bearermonitor
# no QProcess
!vxworks:!qnx:SUBDIRS += network-chat
diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
new file mode 100644
index 0000000..d8ddce5
--- /dev/null
+++ b/src/network/bearer/bearer.pri
@@ -0,0 +1,130 @@
+# Qt network bearer management module
+
+#DEFINES += BEARER_MANAGEMENT_DEBUG
+
+HEADERS += bearer/qnetworkconfiguration.h \
+ bearer/qnetworksession.h \
+ bearer/qnetworkconfigmanager.h
+
+SOURCES += bearer/qnetworksession.cpp \
+ bearer/qnetworkconfigmanager.cpp \
+ bearer/qnetworkconfiguration.cpp
+
+symbian {
+ exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
+ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+ message("Building with SNAP support")
+ DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
+ LIBS += -lcmmanager
+ } else {
+ message("Building without SNAP support")
+ LIBS += -lapengine
+ }
+
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+ HEADERS += bearer/qnetworkconfigmanager_s60_p.h \
+ bearer/qnetworkconfiguration_s60_p.h \
+ bearer/qnetworksession_s60_p.h
+ SOURCES += bearer/qnetworkconfigmanager_s60_p.cpp \
+ bearer/qnetworkconfiguration_s60_p.cpp \
+ bearer/qnetworksession_s60_p.cpp
+
+ LIBS += -lcommdb \
+ -lapsettingshandlerui \
+ -lconnmon \
+ -lcentralrepository \
+ -lesock \
+ -linsock \
+ -lecom \
+ -lefsrv \
+ -lnetmeta
+} else:maemo {
+ QT += dbus
+ CONFIG += link_pkgconfig
+
+ exists(../debug) {
+ message("Enabling debug messages.")
+ DEFINES += BEARER_MANAGEMENT_DEBUG
+ }
+
+ HEADERS += bearer/qnetworksession_maemo_p.h \
+ bearer/qnetworkconfigmanager_maemo_p.h \
+ bearer/qnetworkconfiguration_maemo_p.h
+
+ SOURCES += bearer/qnetworkconfigmanager_maemo.cpp \
+ bearer/qnetworksession_maemo.cpp
+
+ documentation.path = $$QT_MOBILITY_PREFIX/doc
+ documentation.files = doc/html
+
+ PKGCONFIG += glib-2.0 dbus-glib-1 gconf-2.0 osso-ic conninet
+
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_REQUIRES = glib-2.0 dbus-glib-1 gconf-2.0 osso-ic conninet
+ pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
+ pkgconfig.files = QtBearer.pc
+
+ INSTALLS += pkgconfig documentation
+} else {
+ DEFINES += BEARER_ENGINE
+
+ HEADERS += bearer/qnetworkconfigmanager_p.h \
+ bearer/qnetworkconfiguration_p.h \
+ bearer/qnetworksession_p.h \
+ bearer/qnetworksessionengine_p.h \
+ bearer/qgenericengine_p.h
+
+ SOURCES += bearer/qnetworkconfigmanager_p.cpp \
+ bearer/qnetworksession_p.cpp \
+ bearer/qnetworksessionengine.cpp \
+ bearer/qgenericengine.cpp
+
+ unix:!mac:contains(networkmanager_enabled, yes) {
+ contains(QT_CONFIG,dbus) {
+ DEFINES += BACKEND_NM
+ QT += dbus
+
+ HEADERS += bearer/qnmdbushelper_p.h \
+ bearer/qnetworkmanagerservice_p.h \
+ bearer/qnmwifiengine_unix_p.h
+
+ SOURCES += bearer/qnmdbushelper.cpp \
+ bearer/qnetworkmanagerservice_p.cpp \
+ bearer/qnmwifiengine_unix.cpp
+ } else {
+ message("NetworkManager backend requires Qt DBus support")
+ }
+ }
+
+ win32 {
+ HEADERS += bearer/qnlaengine_win_p.h \
+ bearer/qnetworksessionengine_win_p.h
+
+ SOURCES += bearer/qnlaengine_win.cpp
+
+ !wince* {
+ HEADERS += bearer/qnativewifiengine_win_p.h
+
+ SOURCES += bearer/qnativewifiengine_win.cpp
+
+ LIBS += -lWs2_32
+ } else {
+ LIBS += -lWs2
+ }
+ }
+
+ macx {
+ HEADERS += bearer/qcorewlanengine_mac_p.h
+ SOURCES+= bearer/qcorewlanengine_mac.mm
+ LIBS += -framework Foundation -framework SystemConfiguration
+
+ contains(corewlan_enabled, yes) {
+ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
+ LIBS += -framework CoreWLAN
+ DEFINES += MAC_SDK_10_6
+ }
+ }
+ }
+}
+
diff --git a/src/network/bearer/qcorewlanengine_mac.mm b/src/network/bearer/qcorewlanengine_mac.mm
index 5451615..5854384 100644
--- a/src/network/bearer/qcorewlanengine_mac.mm
+++ b/src/network/bearer/qcorewlanengine_mac.mm
@@ -63,7 +63,7 @@
#include <SystemConfiguration/SCNetworkConfiguration.h>
QMap <QString, QString> networkInterfaces;
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QCoreWlanEngine, coreWlanEngine)
@@ -457,5 +457,5 @@ bool QCoreWlanEngine::getAllScInterfaces()
#include "moc_qcorewlanengine_mac_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qcorewlanengine_mac_p.h b/src/network/bearer/qcorewlanengine_mac_p.h
index fc8e4b5..660ddb5 100644
--- a/src/network/bearer/qcorewlanengine_mac_p.h
+++ b/src/network/bearer/qcorewlanengine_mac_p.h
@@ -56,7 +56,8 @@
#include "qnetworksessionengine_p.h"
#include <QMap>
#include <QTimer>
-QTM_BEGIN_NAMESPACE
+
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
@@ -94,7 +95,7 @@ private:
bool isKnownSsid(const QString &interfaceName, const QString &ssid);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/bearer/qgenericengine.cpp b/src/network/bearer/qgenericengine.cpp
index 184a69c..2e48ce8 100644
--- a/src/network/bearer/qgenericengine.cpp
+++ b/src/network/bearer/qgenericengine.cpp
@@ -53,7 +53,7 @@
#include "qnetworksessionengine_win_p.h"
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QGenericEngine, genericEngine)
@@ -230,5 +230,5 @@ QGenericEngine *QGenericEngine::instance()
}
#include "moc_qgenericengine_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qgenericengine_p.h b/src/network/bearer/qgenericengine_p.h
index 976776e..88de2a0 100644
--- a/src/network/bearer/qgenericengine_p.h
+++ b/src/network/bearer/qgenericengine_p.h
@@ -58,7 +58,7 @@
#include <QMap>
#include <QTimer>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
@@ -88,7 +88,7 @@ private:
QTimer pollTimer;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/bearer/qnativewifiengine_win.cpp b/src/network/bearer/qnativewifiengine_win.cpp
index d8fe5fb..b4b3888 100644
--- a/src/network/bearer/qnativewifiengine_win.cpp
+++ b/src/network/bearer/qnativewifiengine_win.cpp
@@ -52,7 +52,7 @@
#include <wtypes.h>
#undef interface
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QNativeWifiEngine, nativeWifiEngine)
@@ -723,4 +723,4 @@ QNativeWifiEngine *QNativeWifiEngine::instance()
#include "moc_qnativewifiengine_win_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnativewifiengine_win_p.h b/src/network/bearer/qnativewifiengine_win_p.h
index 0d5bcb0..adc75e1 100644
--- a/src/network/bearer/qnativewifiengine_win_p.h
+++ b/src/network/bearer/qnativewifiengine_win_p.h
@@ -57,7 +57,7 @@
#include <QtCore/qtimer.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
@@ -90,6 +90,6 @@ private:
Qt::HANDLE handle;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 264f0df..4b28b22 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -47,7 +47,7 @@
#include "qnetworkconfigmanager_p.h"
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QNetworkConfigurationManagerPrivate, connManager);
@@ -329,5 +329,5 @@ void QNetworkConfigurationManager::updateConfigurations()
#include "moc_qnetworkconfigmanager.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 98641f6..940fcc5 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -42,17 +42,15 @@
#ifndef QNETWORKCONFIGURATIONMANAGER_H
#define QNETWORKCONFIGURATIONMANAGER_H
-#include "qmobilityglobal.h"
-
#include <QtCore/qobject.h>
#include "qnetworkconfiguration.h"
QT_BEGIN_HEADER
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationManagerPrivate;
-class Q_BEARER_EXPORT QNetworkConfigurationManager : public QObject
+class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
{
Q_OBJECT
@@ -93,7 +91,7 @@ Q_SIGNALS:
Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::Capabilities)
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
QT_END_HEADER
diff --git a/src/network/bearer/qnetworkconfigmanager_maemo.cpp b/src/network/bearer/qnetworkconfigmanager_maemo.cpp
index 795b054..26909f9 100644
--- a/src/network/bearer/qnetworkconfigmanager_maemo.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_maemo.cpp
@@ -53,7 +53,7 @@
#include <iapconf.h>
#include <iapmonitor.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
#define IAP "/system/osso/connectivity/IAP"
static int iap_prefix_len;
@@ -757,4 +757,4 @@ void QNetworkConfigurationManagerPrivate::configChanged(QNetworkConfigurationPri
#include "qnetworkconfigmanager_maemo.moc"
#include "moc_qnetworkconfigmanager_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfigmanager_maemo_p.h b/src/network/bearer/qnetworkconfigmanager_maemo_p.h
index e182495..a5462b8 100644
--- a/src/network/bearer/qnetworkconfigmanager_maemo_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_maemo_p.h
@@ -60,7 +60,7 @@
#include <QHash>
#include <QStringList>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationManagerPrivate : public QObject
@@ -136,6 +136,6 @@ Q_SIGNALS:
void onlineStateChanged(bool isOnline);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index 8b15f41..49135c1 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -59,7 +59,7 @@
#include <QtCore/qtimer.h>
#include <QtCore/qstringlist.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
void QNetworkConfigurationManagerPrivate::registerPlatformCapabilities()
{
@@ -446,5 +446,5 @@ void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate()
#include "moc_qnetworkconfigmanager_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 0c42f9b..184d1bd 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -59,7 +59,7 @@
#include <QHash>
#include <QStringList>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
#ifdef BEARER_ENGINE
class QNetworkSessionEngine;
@@ -173,6 +173,6 @@ private Q_SLOTS:
#endif
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/network/bearer/qnetworkconfigmanager_s60_p.cpp b/src/network/bearer/qnetworkconfigmanager_s60_p.cpp
index 760a194..8859a4e 100644
--- a/src/network/bearer/qnetworkconfigmanager_s60_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_s60_p.cpp
@@ -58,7 +58,7 @@
#include <aputils.h>
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
static const int KValueThatWillBeAddedToSNAPId = 1000;
static const int KUserChoiceIAPId = 0;
@@ -971,4 +971,4 @@ void AccessPointsAvailabilityScanner::RunL()
}
}
#include "moc_qnetworkconfigmanager_s60_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfigmanager_s60_p.h b/src/network/bearer/qnetworkconfigmanager_s60_p.h
index 296d67f..cd48df6 100644
--- a/src/network/bearer/qnetworkconfigmanager_s60_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_s60_p.h
@@ -65,7 +65,7 @@
class CCommsDatabase;
class QTimer;
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkSessionPrivate;
class AccessPointsAvailabilityScanner;
@@ -177,6 +177,6 @@ private: // Data
TConnMonIapInfoBuf iIapBuf;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index c92b356..9422f07 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -47,7 +47,7 @@
#include "qnetworkconfiguration_p.h"
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
/*!
\class QNetworkConfiguration
@@ -345,5 +345,5 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
}
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index f8c17d5..e1fbc43 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -42,18 +42,17 @@
#ifndef QNETWORKCONFIGURATION_H
#define QNETWORKCONFIGURATION_H
-#include "qmobilityglobal.h"
-
+#include <QtCore/qglobal.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
#include <QtCore/qlist.h>
QT_BEGIN_HEADER
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
-class Q_BEARER_EXPORT QNetworkConfiguration
+class Q_NETWORK_EXPORT QNetworkConfiguration
{
public:
QNetworkConfiguration();
@@ -106,7 +105,7 @@ private:
QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
QT_END_HEADER
diff --git a/src/network/bearer/qnetworkconfiguration_maemo_p.h b/src/network/bearer/qnetworkconfiguration_maemo_p.h
index 8d786aa..8d7fbcf 100644
--- a/src/network/bearer/qnetworkconfiguration_maemo_p.h
+++ b/src/network/bearer/qnetworkconfiguration_maemo_p.h
@@ -57,7 +57,7 @@
#include <QtCore/qshareddata.h>
#include <QNetworkInterface>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate : public QSharedData
{
@@ -104,6 +104,6 @@ private:
QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONPRIVATE_H
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index a3bcd9a..1dd53c4 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -57,7 +57,7 @@
#include <QtCore/qshareddata.h>
#include <QNetworkInterface>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate : public QSharedData
{
@@ -99,6 +99,6 @@ private:
QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONPRIVATE_H
diff --git a/src/network/bearer/qnetworkconfiguration_s60_p.cpp b/src/network/bearer/qnetworkconfiguration_s60_p.cpp
index 61548ba..289e09c 100644
--- a/src/network/bearer/qnetworkconfiguration_s60_p.cpp
+++ b/src/network/bearer/qnetworkconfiguration_s60_p.cpp
@@ -41,7 +41,7 @@
#include "qnetworkconfiguration_s60_p.h"
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
QNetworkConfigurationPrivate::QNetworkConfigurationPrivate()
: isValid(false), type(QNetworkConfiguration::Invalid),
@@ -57,4 +57,4 @@ QNetworkConfigurationPrivate::~QNetworkConfigurationPrivate()
serviceNetworkMembers.clear();
}
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfiguration_s60_p.h b/src/network/bearer/qnetworkconfiguration_s60_p.h
index 44f8f56..bccad0c 100644
--- a/src/network/bearer/qnetworkconfiguration_s60_p.h
+++ b/src/network/bearer/qnetworkconfiguration_s60_p.h
@@ -56,7 +56,7 @@
#include <qnetworkconfiguration.h>
#include <QtCore/qshareddata.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate : public QSharedData
{
@@ -102,7 +102,7 @@ private:
QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKCONFIGURATIONPRIVATE_H
diff --git a/src/network/bearer/qnetworkmanagerservice_p.cpp b/src/network/bearer/qnetworkmanagerservice_p.cpp
index 2f91af0..4e25533 100644
--- a/src/network/bearer/qnetworkmanagerservice_p.cpp
+++ b/src/network/bearer/qnetworkmanagerservice_p.cpp
@@ -57,7 +57,7 @@
#include "qnetworkmanagerservice_p.h"
//Q_DECLARE_METATYPE(QList<uint>)
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
static QDBusConnection dbusConnection = QDBusConnection::systemBus();
//static QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbusConnection);
@@ -1008,4 +1008,4 @@ QStringList QNetworkManagerIp4Config::domains() const
#include "moc_qnetworkmanagerservice_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkmanagerservice_p.h b/src/network/bearer/qnetworkmanagerservice_p.h
index 8569e71..91bf69d 100644
--- a/src/network/bearer/qnetworkmanagerservice_p.h
+++ b/src/network/bearer/qnetworkmanagerservice_p.h
@@ -64,19 +64,16 @@
#include <QDBusPendingCallWatcher>
-#include <qnmdbushelper_p.h>
+#include "qnmdbushelper_p.h"
+QT_BEGIN_NAMESPACE
-QTM_BEGIN_NAMESPACE
typedef QMap< QString, QMap<QString,QVariant> > QNmSettingsMap;
typedef QList<quint32> ServerThing;
-QTM_END_NAMESPACE
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QNmSettingsMap))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(ServerThing))
+Q_DECLARE_METATYPE(QNmSettingsMap)
+Q_DECLARE_METATYPE(ServerThing)
-
-QTM_BEGIN_NAMESPACE
class QNetworkManagerInterfacePrivate;
class QNetworkManagerInterface : public QObject
{
@@ -395,6 +392,6 @@ public:
};
////
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKMANAGERSERVICE_H
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index d3a323a..bdae9bc 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -52,7 +52,7 @@
#include "qnetworksession_p.h"
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
/*!
\class QNetworkSession
@@ -686,4 +686,4 @@ void QNetworkSession::disconnectNotify(const char *signal)
#include "moc_qnetworksession.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 47377c4..61093c7 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -42,8 +42,6 @@
#ifndef QNETWORKSESSION_H
#define QNETWORKSESSION_H
-#include "qmobilityglobal.h"
-
#include <QtCore/qobject.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
@@ -54,10 +52,10 @@
QT_BEGIN_HEADER
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkSessionPrivate;
-class Q_BEARER_EXPORT QNetworkSession : public QObject
+class Q_NETWORK_EXPORT QNetworkSession : public QObject
{
Q_OBJECT
public:
@@ -128,7 +126,7 @@ private:
friend class QNetworkSessionPrivate;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
QT_END_HEADER
diff --git a/src/network/bearer/qnetworksession_maemo.cpp b/src/network/bearer/qnetworksession_maemo.cpp
index c7c7a31..742499c 100644
--- a/src/network/bearer/qnetworksession_maemo.cpp
+++ b/src/network/bearer/qnetworksession_maemo.cpp
@@ -54,7 +54,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
static QHash<QString, QVariant> properties;
@@ -1178,4 +1178,4 @@ QNetworkSession::SessionError QNetworkSessionPrivate::error() const
#include "qnetworksession_maemo.moc"
#include "moc_qnetworksession_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksession_maemo_p.h b/src/network/bearer/qnetworksession_maemo_p.h
index e233087..6594176 100644
--- a/src/network/bearer/qnetworksession_maemo_p.h
+++ b/src/network/bearer/qnetworksession_maemo_p.h
@@ -62,7 +62,7 @@
#include <icd/dbus_api.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkSessionPrivate : public QObject
{
@@ -161,7 +161,7 @@ private:
void cleanupSession(void);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKSESSIONPRIVATE_H
diff --git a/src/network/bearer/qnetworksession_p.cpp b/src/network/bearer/qnetworksession_p.cpp
index c6f9833..6df4fdb9 100644
--- a/src/network/bearer/qnetworksession_p.cpp
+++ b/src/network/bearer/qnetworksession_p.cpp
@@ -63,7 +63,7 @@
#include "qnmwifiengine_unix_p.h"
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
#if defined(BACKEND_NM)
static bool NetworkManagerAvailable()
@@ -538,5 +538,5 @@ if(serviceName.isEmpty())
#endif
#include "moc_qnetworksession_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index a2aaa6a..45e0ebf 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -63,7 +63,8 @@
#include <QNetworkInterface>
#include <QDateTime>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
+
#ifdef BEARER_ENGINE
class QNetworkSessionEngine;
#endif
@@ -161,7 +162,7 @@ private:
#endif
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKSESSIONPRIVATE_H
diff --git a/src/network/bearer/qnetworksession_s60_p.cpp b/src/network/bearer/qnetworksession_s60_p.cpp
index 764c1c4..0a54b87 100644
--- a/src/network/bearer/qnetworksession_s60_p.cpp
+++ b/src/network/bearer/qnetworksession_s60_p.cpp
@@ -49,7 +49,7 @@
#include <stdapis/sys/socket.h>
#include <stdapis/net/if.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
QNetworkSessionPrivate::QNetworkSessionPrivate()
: CActive(CActive::EPriorityStandard), state(QNetworkSession::Invalid),
@@ -1165,4 +1165,4 @@ void ConnectionProgressNotifier::RunL()
#include "moc_qnetworksession_s60_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksession_s60_p.h b/src/network/bearer/qnetworksession_s60_p.h
index cfb99c9..6e62f10 100644
--- a/src/network/bearer/qnetworksession_s60_p.h
+++ b/src/network/bearer/qnetworksession_s60_p.h
@@ -67,7 +67,7 @@
typedef int(*TOpenCSetdefaultifFunction)(const struct ifreq*);
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class ConnectionProgressNotifier;
@@ -207,7 +207,7 @@ private: // Data
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif //QNETWORKSESSIONPRIVATE_H
diff --git a/src/network/bearer/qnetworksessionengine.cpp b/src/network/bearer/qnetworksessionengine.cpp
index 55fc4f3..7148d14 100644
--- a/src/network/bearer/qnetworksessionengine.cpp
+++ b/src/network/bearer/qnetworksessionengine.cpp
@@ -41,7 +41,7 @@
#include "qnetworksessionengine_p.h"
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
QNetworkSessionEngine::QNetworkSessionEngine(QObject *parent)
: QObject(parent)
@@ -53,5 +53,5 @@ QNetworkSessionEngine::~QNetworkSessionEngine()
}
#include "moc_qnetworksessionengine_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksessionengine_p.h b/src/network/bearer/qnetworksessionengine_p.h
index 795a209..6be750f 100644
--- a/src/network/bearer/qnetworksessionengine_p.h
+++ b/src/network/bearer/qnetworksessionengine_p.h
@@ -53,13 +53,12 @@
// We mean it.
//
-#include <qmobilityglobal.h>
#include <QtCore/qobject.h>
#include <QtCore/qglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qstring.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
class QNetworkSessionEngine : public QObject
@@ -93,6 +92,6 @@ Q_SIGNALS:
void connectionError(const QString &id, QNetworkSessionEngine::ConnectionError error);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/bearer/qnlaengine_win.cpp b/src/network/bearer/qnlaengine_win.cpp
index b606ef4..b1156d0 100644
--- a/src/network/bearer/qnlaengine_win.cpp
+++ b/src/network/bearer/qnlaengine_win.cpp
@@ -51,7 +51,7 @@
#include "qnetworksessionengine_win_p.h"
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QNlaEngine, nlaEngine)
@@ -586,7 +586,7 @@ QNlaEngine *QNlaEngine::instance()
#include "qnlaengine_win.moc"
#include "moc_qnlaengine_win_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnlaengine_win_p.h b/src/network/bearer/qnlaengine_win_p.h
index 394b8cf..d9d752b 100644
--- a/src/network/bearer/qnlaengine_win_p.h
+++ b/src/network/bearer/qnlaengine_win_p.h
@@ -57,7 +57,7 @@
#include <QMap>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
class QNlaThread;
@@ -99,6 +99,6 @@ private:
QMap<uint, QString> configurationInterface;
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/bearer/qnmdbushelper.cpp b/src/network/bearer/qnmdbushelper.cpp
index 3b780f6..e8ac78e 100644
--- a/src/network/bearer/qnmdbushelper.cpp
+++ b/src/network/bearer/qnmdbushelper.cpp
@@ -54,7 +54,7 @@
#include <QDebug>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
void QNmDBusHelper::deviceStateChanged(quint32 state)
{
@@ -114,4 +114,4 @@ void QNmDBusHelper::slotSettingsRemoved()
}
#include "moc_qnmdbushelper_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnmdbushelper_p.h b/src/network/bearer/qnmdbushelper_p.h
index f0248dc..ebd4e63 100644
--- a/src/network/bearer/qnmdbushelper_p.h
+++ b/src/network/bearer/qnmdbushelper_p.h
@@ -53,14 +53,13 @@
// We mean it.
//
-#include <qmobilityglobal.h>
#if !defined(QT_NO_DBUS) && !defined(Q_OS_MAC)
#include <QDBusObjectPath>
#include <QDBusContext>
#include <QMap>
#endif
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
#if !defined(QT_NO_DBUS) && !defined(Q_OS_MAC)
@@ -85,6 +84,6 @@ Q_SIGNALS:
};
#endif
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif// QNMDBUSHELPERPRIVATE_H
diff --git a/src/network/bearer/qnmwifiengine_unix.cpp b/src/network/bearer/qnmwifiengine_unix.cpp
index f558fa8..c228bcc 100644
--- a/src/network/bearer/qnmwifiengine_unix.cpp
+++ b/src/network/bearer/qnmwifiengine_unix.cpp
@@ -51,16 +51,12 @@
#include <QNetworkInterface>
+QT_BEGIN_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QNmWifiEngine, nmWifiEngine)
typedef QList<QList<uint> > QNmSettingsAddressMap;
-QTM_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QNmSettingsAddressMap))
-QTM_BEGIN_NAMESPACE
+Q_DECLARE_METATYPE(QNmSettingsAddressMap)
QNmWifiEngine::QNmWifiEngine(QObject *parent)
: QNetworkSessionEngine(parent)
@@ -1129,5 +1125,5 @@ QStringList QNmWifiEngine::getConnectionPathForId(const QString &uuid)
#include "moc_qnmwifiengine_unix_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnmwifiengine_unix_p.h b/src/network/bearer/qnmwifiengine_unix_p.h
index 1287800..a1bdb7b 100644
--- a/src/network/bearer/qnmwifiengine_unix_p.h
+++ b/src/network/bearer/qnmwifiengine_unix_p.h
@@ -67,7 +67,7 @@
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
@@ -157,7 +157,7 @@ private slots:
void slotActivationFinished(QDBusPendingCallWatcher*);
};
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif
diff --git a/src/network/network.pro b/src/network/network.pro
index e890b94..8582d8a 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -17,6 +17,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
include(../qbase.pri)
include(access/access.pri)
+include(bearer/bearer.pri)
include(kernel/kernel.pri)
include(socket/socket.pri)
include(ssl/ssl.pri)
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;