summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-01-24 10:25:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-24 15:08:23 +0100
commit57c58001eb73a64a3c6b83966c9e70dd2b45f841 (patch)
treee96dabe14e8e58885fe3646ccf2ec81a75e619a0
parentf7ca7ae50ef1e36a85dc3eb8541aaa8907176447 (diff)
downloadqtbase-57c58001eb73a64a3c6b83966c9e70dd2b45f841.tar.gz
qtbase-57c58001eb73a64a3c6b83966c9e70dd2b45f841.tar.bz2
qtbase-57c58001eb73a64a3c6b83966c9e70dd2b45f841.zip
Remove obsolete parts from QNAM documentation
Meego/Haramttan is no more and QtMobility only works for Qt 4.x anyway. Change-Id: I3840358011f9d0e14de4d0ce9de15bba546964c5 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 980b19b7e4..c89419091f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -224,12 +224,7 @@ static void ensureInitialized()
\note The network and roaming support in QNetworkAccessManager is conditional
upon the platform supporting connection management. The
\l QNetworkConfigurationManager::NetworkSessionRequired can be used to
- detect whether QNetworkAccessManager utilizes this feature. Currently only
- 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.
+ detect whether QNetworkAccessManager utilizes this feature.
\sa QNetworkRequest, QNetworkReply, QNetworkProxy
*/