diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-19 15:17:35 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-19 15:17:35 (GMT) |
| commit | 0ed2d865900312d3e85886c5e36867e633179a83 (patch) | |
| tree | 4f285903c3667d3dc5262541dc4131c49a82ab22 | |
| parent | 3772d559f7e19189ceeac1094f7526176681ba1c (diff) | |
| parent | a60259b676743f078178185a6c587381bd957d3c (diff) | |
| download | Qt-0ed2d865900312d3e85886c5e36867e633179a83.zip Qt-0ed2d865900312d3e85886c5e36867e633179a83.tar.gz Qt-0ed2d865900312d3e85886c5e36867e633179a83.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 5 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 1 |
3 files changed, 2 insertions, 5 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: diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 3fbeb44..77b03d2 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -29,7 +29,6 @@ qhp.Qt.indexRoot = # See also extraimages.HTML qhp.Qt.extraFiles = classic.css \ images/qt-logo.png \ - images/trolltech-logo \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 1ec9b72..d154254 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -31,7 +31,6 @@ qhp.Qt.indexRoot = # See also extraimages.HTML qhp.Qt.extraFiles = classic.css \ images/qt-logo.png \ - images/trolltech-logo \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ |