Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp

3 files changed, 23 insertions, 0 deletions

diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index af60a43bdd..6106550793 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -705,6 +705,15 @@ void QNetworkSession::disconnectNotify(const char *signal)
         d->setALREnabled(false);
 }
 
+#ifdef Q_OS_SYMBIAN
+RConnection* QNetworkSessionPrivate::nativeSession(QNetworkSession &s)
+{
+    if (!s.d)
+        return 0;
+    return s.d->nativeSession();
+}
+#endif
+
 #include "moc_qnetworksession.cpp"
 
 QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 688f37eba4..c08a9bf488 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -140,6 +140,9 @@ private:
     QNetworkSessionPrivate *d;
 };
 
+Q_DECLARE_METATYPE(QNetworkSession::State);
+Q_DECLARE_METATYPE(QNetworkSession::SessionError);
+
 #ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QNetworkSession::State)
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 707ad3751e..e2fcfe6009 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -55,9 +55,14 @@
 
 #include "qnetworksession.h"
 #include "qnetworkconfiguration_p.h"
+#include "QtCore/qsharedpointer.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 
+#ifdef Q_OS_SYMBIAN
+class RConnection;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject
@@ -102,6 +107,10 @@ public:
     virtual quint64 bytesReceived() const = 0;
     virtual quint64 activeTime() const = 0;
 
+#ifdef Q_OS_SYMBIAN
+    static RConnection* nativeSession(QNetworkSession&);
+    virtual RConnection* nativeSession() = 0;
+#endif
 protected:
     inline QNetworkConfigurationPrivatePointer privateConfiguration(const QNetworkConfiguration &config) const
     {
@@ -145,6 +154,8 @@ protected:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QSharedPointer<QNetworkSession>)
+
 #endif // QT_NO_BEARERMANAGEMENT
 
 #endif // QNETWORKSESSIONPRIVATE_H