Bearer Management Integration 4.

5 files changed, 15 insertions, 15 deletions

diff --git a/src/network/bearer/bearer.pro b/src/network/bearer/bearer.pro
index ce39db6..b8e4d06 100644
--- a/src/network/bearer/bearer.pro
+++ b/src/network/bearer/bearer.pro
@@ -50,19 +50,11 @@ symbian: {
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x2002AC81
             
-    deploy.path = $${EPOCROOT}
-    exportheaders.sources = $$PUBLIC_HEADERS
-    exportheaders.path = epoc32/include
-    for(header, exportheaders.sources) {
-        BLD_INF_RULES.prj_exports += "$$header $$deploy.path$$exportheaders.path/$$basename(header)"
-    }
-            
     QtBearerManagement.sources = QtBearer.dll
     QtBearerManagement.path = /sys/bin
     DEPLOYMENT += QtBearerManagement
 } else {
     maemo6 {
-        QT += dbus
 	CONFIG += link_pkgconfig
 
 	exists(../debug) {
@@ -159,4 +151,5 @@ symbian: {
     }
 }
 
+CONFIG += middleware
 include(../../features/deploy.pri)
diff --git a/src/network/bearer/qnetworkconfigmanager_maemo.cpp b/src/network/bearer/qnetworkconfigmanager_maemo.cpp
index 795b054..1482fa7 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/qnetworkconfiguration_s60_p.cpp b/src/network/bearer/qnetworkconfiguration_s60_p.cpp
index 02115d9..ee50bd5 100644
--- a/src/network/bearer/qnetworkconfiguration_s60_p.cpp
+++ b/src/network/bearer/qnetworkconfiguration_s60_p.cpp
@@ -68,7 +68,7 @@ QString QNetworkConfigurationPrivate::bearerName() const
         case QNetworkConfigurationPrivate::BearerHSPA:      return QLatin1String("HSPA");
         case QNetworkConfigurationPrivate::BearerBluetooth: return QLatin1String("Bluetooth");
         case QNetworkConfigurationPrivate::BearerWiMAX:     return QLatin1String("WiMAX");
-        default: return QLatin1String("Unknown");
+        default: return QString();
     }
 }
 
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 6171350..28afcfe 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -141,7 +141,7 @@ QTM_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.
@@ -328,7 +328,10 @@ void QNetworkSession::close()
 /*!
     Invalidates all open sessions against the network interface and therefore stops the 
     underlying network interface. This function always changes the session's state() flag to
-    \l Disconnected.
+    \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()
 */
diff --git a/src/network/bearer/qnetworksession_maemo_p.h b/src/network/bearer/qnetworksession_maemo_p.h
index 892262d..e3b7ffb 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
 
 QTM_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
     {
     }