Merge commit 'BearerIntegration-4' into bearermanagement/integration-4

Conflicts:
	config.tests/unix/networkmanager/networkmanager.pro
	src/network/bearer/bearer.pro
	src/network/bearer/qnetworkconfiguration_s60_p.cpp
	tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro

4 files changed, 12 insertions, 6 deletions

diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
index 0450961..66b0ca4 100644
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@@ -11,7 +11,6 @@ SOURCES += bearer/qnetworksession.cpp \
            bearer/qnetworkconfiguration.cpp
 
 maemo {
-    QT += dbus
     CONFIG += link_pkgconfig
 
     exists(../debug) {
diff --git a/src/network/bearer/qnetworkconfigmanager_maemo.cpp b/src/network/bearer/qnetworkconfigmanager_maemo.cpp
index 2188d61..96da30d 100644
--- a/src/network/bearer/qnetworkconfigmanager_maemo.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_maemo.cpp
@@ -44,7 +44,6 @@
 #include "qnetworkconfigmanager_maemo_p.h"
 
 #include <QDebug>
-#include <QtDBus>
 #include <QHash>
 
 #include <wlancond.h>
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 78e38ba..01784e2 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
 
     \value UnknownSessionError          An unidentified error occurred.
     \value SessionAbortedError          The session was aborted by the user or system.
-    \value RoamingError                 The session cannot roam to the new configuration.
+    \value RoamingError                 The session cannot roam to a new configuration.
     \value OperationNotSupportedError   The operation is not supported for current configuration.
     \value InvalidConfigurationError    The operation cannot currently be performed for the
                                         current configuration.
@@ -348,6 +348,9 @@ void QNetworkSession::close()
     underlying network interface. This function always changes the session's state() flag to
     \l Disconnected.
 
+    On Symbian platform, a 'NetworkControl' capability is required for
+    full interface-level stop (without the capability, only the current session is stopped).
+
     \sa open(), close()
 */
 void QNetworkSession::stop()
diff --git a/src/network/bearer/qnetworksession_maemo_p.h b/src/network/bearer/qnetworksession_maemo_p.h
index 6febce4..ff294f6 100644
--- a/src/network/bearer/qnetworksession_maemo_p.h
+++ b/src/network/bearer/qnetworksession_maemo_p.h
@@ -52,7 +52,6 @@
 //
 // We mean it.
 //
-
 #include "qnetworkconfigmanager_maemo_p.h"
 #include "qnetworksession.h"
 
@@ -60,7 +59,9 @@
 #include <QNetworkInterface>
 #include <QDateTime>
 
+#ifdef Q_WS_MAEMO_6
 #include <icd/dbus_api.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -69,8 +70,12 @@ class QNetworkSessionPrivate : public QObject
     Q_OBJECT
 public:
     QNetworkSessionPrivate() : 
-	    tx_data(0), rx_data(0), m_activeTime(0), isOpen(false),
-	    connectFlags(ICD_CONNECTION_FLAG_USER_EVENT)
+        tx_data(0), rx_data(0), m_activeTime(0), isOpen(false),
+#ifdef Q_WS_MAEMO_6
+        connectFlags(ICD_CONNECTION_FLAG_USER_EVENT)
+#else
+        connectFlags(0)
+#endif
     {
     }