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

4 files changed, 10 insertions, 30 deletions

diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index b8a006b38f..6cc1b4342e 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -1,13 +1,4 @@
 SOURCES += main.cpp
 TARGET = qnetworksessionlackey
-INCLUDEPATH += ../../../../src/bearer
-DEPENDPATH += ../../../../src/bearer
 
 QT = core network
-
-CONFIG+= testcase
-
-include(../../../../common.pri)
-
-CONFIG += mobility
-MOBILITY = bearer
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index f3a7a07ffa..a84021db70 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.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
@@ -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 86b3e46270..061108aeec 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.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
@@ -51,7 +51,7 @@
 #include <iapconf.h>
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 Q_DECLARE_METATYPE(QNetworkSession::State);
@@ -170,7 +170,7 @@ void tst_QNetworkSession::initTestCase()
     dbus_send.waitForFinished();
 #endif
 
-    inProcessSessionManagementCount = 0;
+    inProcessSessionManagementCount = -1;
 
     QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
     manager.updateConfigurations();
@@ -426,6 +426,8 @@ void tst_QNetworkSession::sessionOpenCloseStop_data()
         QTest::newRow((name + QLatin1String(" stop")).toLocal8Bit().constData())
             << config << true;
     }
+
+    inProcessSessionManagementCount = 0;
 }
 
 void tst_QNetworkSession::sessionOpenCloseStop()
@@ -817,7 +819,7 @@ void tst_QNetworkSession::outOfProcessSession()
             output = oopSocket->readLine().trimmed();
 
         if (output.startsWith("Started session ")) {
-            QString identifier = QString::fromLocal8Bit(output.mid(16).constData());
+            QString identifier = QString::fromLocal8Bit(output.mid(20).constData());
 
             QNetworkConfiguration changed;
 
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index ccc405eb5b..85aa5aa580 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -1,22 +1,9 @@
+load(qttest_p4)
 SOURCES  += tst_qnetworksession.cpp
 HEADERS  += ../../qbearertestcommon.h
-TARGET = tst_qnetworksession
-CONFIG += testcase
 
 QT = core network
 
-INCLUDEPATH += ../../../../src/bearer
-
-include(../../../../common.pri)
-CONFIG += mobility
-MOBILITY = bearer
-
-wince* {
-    LACKEY.sources = $$OUTPUT_DIR/build/tests/bin/qnetworksessionlackey.exe
-    LACKEY.path = .
-    DEPLOYMENT += LACKEY
-}
-
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
+}
\ No newline at end of file