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

6 files changed, 9 insertions, 18 deletions

diff --git a/tests/manual/networkmanager/networkmanager.pro b/tests/manual/networkmanager/networkmanager.pro
index 7ff370a..84289d3 100644
--- a/tests/manual/networkmanager/networkmanager.pro
+++ b/tests/manual/networkmanager/networkmanager.pro
@@ -4,17 +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)
-
-CONFIG += mobility
-MOBILITY = bearer
-
-#MOC_DIR = .moc
-#OBJECTS_DIR = .obj
 FORMS += dialog.ui
diff --git a/tests/manual/networkmanager/networkmanagertest.cpp b/tests/manual/networkmanager/networkmanagertest.cpp
index a39b041..8a6c5fa 100644
--- a/tests/manual/networkmanager/networkmanagertest.cpp
+++ b/tests/manual/networkmanager/networkmanagertest.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
diff --git a/tests/manual/networkmanager/nmview.cpp b/tests/manual/networkmanager/nmview.cpp
index fde5cae..9e28ff0 100644
--- a/tests/manual/networkmanager/nmview.cpp
+++ b/tests/manual/networkmanager/nmview.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
@@ -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 e15aacd..41ee04f 100644
--- a/tests/manual/networkmanager/nmview.h
+++ b/tests/manual/networkmanager/nmview.h
@@ -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
@@ -47,7 +47,7 @@
 
 #include "ui_dialog.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 class QListWidget;
diff --git a/tests/manual/networkmanager/startdlg.cpp b/tests/manual/networkmanager/startdlg.cpp
index 4720932..e34b5e9 100644
--- a/tests/manual/networkmanager/startdlg.cpp
+++ b/tests/manual/networkmanager/startdlg.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
@@ -38,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include "startdlg.h"
 #include <NetworkManager/NetworkManager.h>
 
diff --git a/tests/manual/networkmanager/startdlg.h b/tests/manual/networkmanager/startdlg.h
index a9f1e7c..32c8557 100644
--- a/tests/manual/networkmanager/startdlg.h
+++ b/tests/manual/networkmanager/startdlg.h
@@ -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
@@ -38,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <QDialog>
 #include <QtDBus>
 #include <QtGui>