summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 15:17:35 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 15:17:35 (GMT)
commit0ed2d865900312d3e85886c5e36867e633179a83 (patch)
tree4f285903c3667d3dc5262541dc4131c49a82ab22 /src
parent3772d559f7e19189ceeac1094f7526176681ba1c (diff)
parenta60259b676743f078178185a6c587381bd957d3c (diff)
downloadQt-0ed2d865900312d3e85886c5e36867e633179a83.zip
Qt-0ed2d865900312d3e85886c5e36867e633179a83.tar.gz
Qt-0ed2d865900312d3e85886c5e36867e633179a83.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index ed2f220..907aaef 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -112,8 +112,6 @@ static void ensureInitialized()
are supplied that take a request and optional data, and each return a
QNetworkReply object. The returned object is used to obtain any data
returned in response to the corresponding request.
- the reply to is where most of the signals as well
- as the downloaded data are posted.
A simple download off the network could be accomplished with:
\snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 0
@@ -122,7 +120,8 @@ static void ensureInitialized()
takes is the QNetworkReply object containing the downloaded data
as well as meta-data (headers, etc.).
- \note The slot is responsible for deleting the object at that point.
+ \note After the request has finished, it is the responsibility of the user
+ to delete the QNetworkReply object at an appropriate time.
A more involved example, assuming the manager is already existent,
can be: