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

12 files changed, 257 insertions, 218 deletions

diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp
index 27e6bd1..f8b3d3c 100644
--- a/config.tests/unix/networkmanager/main.cpp
+++ b/config.tests/unix/networkmanager/main.cpp
@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#if defined(QT_NO_DBUS)
+sjkp //error is no QtDBus
+#endif
 #include <NetworkManager/NetworkManager.h>
 
 int main(int argc, char** argv)
diff --git a/config.tests/unix/networkmanager/networkmanager.pro b/config.tests/unix/networkmanager/networkmanager.pro
index c41204f..686286d 100644
--- a/config.tests/unix/networkmanager/networkmanager.pro
+++ b/config.tests/unix/networkmanager/networkmanager.pro
@@ -1,3 +1,7 @@
 SOURCES = main.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
+
+!contains(QT_CONFIG,dbus): {
+    DEFINES += QT_NO_DBUS
+}
\ No newline at end of file
diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro
index b82857d..c07626a 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/network/bearercloud/bearercloud.pro
@@ -13,4 +13,4 @@ QT = core gui network svg
 
 CONFIG += console
 
-symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
+symbian:TARGET.CAPABILITY = NetworkServices ReadUserData
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index db1727b..4b86187 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -23,4 +23,4 @@ win32 {
 
 CONFIG += console
 
-symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
+symbian:TARGET.CAPABILITY = NetworkServices ReadUserData
diff --git a/examples/network/bearermonitor/sessionwidget.ui b/examples/network/bearermonitor/sessionwidget.ui
index f02f306..65ca43b 100644
--- a/examples/network/bearermonitor/sessionwidget.ui
+++ b/examples/network/bearermonitor/sessionwidget.ui
@@ -7,240 +7,248 @@
     <x>0</x>
     <y>0</y>
     <width>340</width>
-    <height>220</height>
+    <height>286</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QHBoxLayout" name="sessionIdLayout">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="sessionIdLabel">
-       <property name="text">
-        <string>Session ID:</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="sessionIdLayout">
+       <item>
+        <widget class="QLabel" name="sessionIdLabel">
+         <property name="text">
+          <string>Session ID:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="sessionId">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QLabel" name="sessionId">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="sessionStateLayout">
-     <item>
-      <widget class="QLabel" name="sessionStateLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Session State:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="sessionState">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Invalid</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="configurationLayout">
-     <item>
-      <widget class="QLabel" name="configurationLabel">
-       <property name="text">
-        <string>Configuration:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="configuration">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="bearerLayout">
-     <item>
-      <widget class="QLabel" name="bearerLabel">
-       <property name="text">
-        <string>Bearer:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="bearer">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="interfaceNameLayout">
-     <item>
-      <widget class="QLabel" name="interfaceNameLabel">
-       <property name="text">
-        <string>Interface Name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="interfaceName">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="interfaceGuidLayout">
-     <item>
-      <widget class="QLabel" name="interfaceGuidLabel">
-       <property name="text">
-        <string>Interface GUID:</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="sessionStateLayout">
+       <item>
+        <widget class="QLabel" name="sessionStateLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Session State:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="sessionState">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Invalid</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QLabel" name="interfaceGuid">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="configurationLayout">
+       <item>
+        <widget class="QLabel" name="configurationLabel">
+         <property name="text">
+          <string>Configuration:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="configuration">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="lastErrorLayout">
      <item>
-      <widget class="QLabel" name="lastErrorLabel">
-       <property name="text">
-        <string>Last Error:</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="bearerLayout">
+       <item>
+        <widget class="QLabel" name="bearerLabel">
+         <property name="text">
+          <string>Bearer:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="bearer">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QLabel" name="lastError">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="interfaceNameLayout">
+       <item>
+        <widget class="QLabel" name="interfaceNameLabel">
+         <property name="text">
+          <string>Interface Name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="interfaceName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="errorStringLayout">
      <item>
-      <widget class="QLabel" name="errorStringLabel">
-       <property name="text">
-        <string>Error String</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="interfaceGuidLayout">
+       <item>
+        <widget class="QLabel" name="interfaceGuidLabel">
+         <property name="text">
+          <string>Interface GUID:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="interfaceGuid">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QLabel" name="errorString">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="buttonLayout">
-     <item>
-      <widget class="QPushButton" name="openSessionButton">
-       <property name="text">
-        <string>Open</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="lastErrorLayout">
+       <item>
+        <widget class="QLabel" name="lastErrorLabel">
+         <property name="text">
+          <string>Last Error:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="lastError">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QPushButton" name="openSyncSessionButton">
-       <property name="text">
-        <string>Blocking Open</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="errorStringLayout">
+       <item>
+        <widget class="QLabel" name="errorStringLabel">
+         <property name="text">
+          <string>Error String</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="errorString">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QPushButton" name="closeSessionButton">
-       <property name="text">
-        <string>Close</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QPushButton" name="openSessionButton">
+         <property name="text">
+          <string>Open</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="openSyncSessionButton">
+         <property name="text">
+          <string>Blocking Open</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QPushButton" name="stopSessionButton">
-       <property name="text">
-        <string>Stop</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QPushButton" name="closeSessionButton">
+         <property name="text">
+          <string>Close</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="stopSessionButton">
+         <property name="text">
+          <string>Stop</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
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
     {
     }
 
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
index 05d17f1..30eb5f0 100644
--- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
+++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
@@ -7,3 +7,9 @@ QT = core network
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
 }
+
+maemo6 {
+    CONFIG += link_pkgconfig
+
+    PKGCONFIG += conninet
+}
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
index ce11cc7..df2d2d9 100644
--- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -7,3 +7,9 @@ QT = core network
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData 
 }
+
+maemo6 {
+    CONFIG += link_pkgconfig
+
+    PKGCONFIG += conninet
+}
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index 85aa5aa..ffa3b25 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -6,4 +6,10 @@ QT = core network
 
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
\ No newline at end of file
+}
+
+maemo6 {
+    CONFIG += link_pkgconfig
+
+    PKGCONFIG += conninet
+}