summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-11-01 14:20:19 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-14 18:41:17 +0100
commit4329030b77dc2faf267cecc0a8b03ce3ed3437cf (patch)
tree3c543ff088b626b3aaa5b58826b7e595776d82ca /src/network/access
parent49bd825a9626eda77fd9e8313e1868bed4c77bff (diff)
network: remove Symbian specific code
removes several files and cleans up the code, removing all Symbian specific #ifdef's etc. Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp4
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp12
2 files changed, 1 insertions, 15 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 51aed45753..fca3d5999e 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -69,11 +69,7 @@
QT_BEGIN_NAMESPACE
-#ifdef Q_OS_SYMBIAN
-const int QHttpNetworkConnectionPrivate::defaultChannelCount = 3;
-#else
const int QHttpNetworkConnectionPrivate::defaultChannelCount = 6;
-#endif
// The pipeline length. So there will be 4 requests in flight.
const int QHttpNetworkConnectionPrivate::defaultPipelineLength = 3;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 7eb4c4c6ae..3978bd6c85 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -160,22 +160,12 @@ static void ensureInitialized()
upon the platform supporting connection management. The
\l QNetworkConfigurationManager::NetworkSessionRequired can be used to
detect whether QNetworkAccessManager utilizes this feature. Currently only
- Meego/Harmattan and Symbian platforms provide connection management support.
+ Meego/Harmattan platforms provide connection management support.
\note This feature cannot be used in combination with the Bearer Management
API as provided by QtMobility. Applications have to migrate to the Qt version
of Bearer Management.
- \section1 Symbian Platform Security Requirements
-
- On Symbian, processes which use this class must have the
- \c NetworkServices platform security capability. If the client
- process lacks this capability, operations will result in a panic.
-
- Platform security capabilities are added via the
- \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
- qmake variable.
-
\sa QNetworkRequest, QNetworkReply, QNetworkProxy
*/