summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-06-12 12:43:15 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-06-12 12:43:15 (GMT)
commit5038fe5d545292c58f0e06b1b6a34115ef8d357a (patch)
tree87a5ed53c8be616d5437fa0877ec2ea98de5c614 /src/network
parentc53414e11b3f980f81a4470b3fb52f9d1aa80d56 (diff)
parentd834d94bde645d43dd981154bd0ba99d8e81f040 (diff)
downloadQt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.zip
Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.gz
Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qhttp.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 49ce5a3..711de24 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -1413,6 +1413,7 @@ QString QHttpRequestHeader::toString() const
****************************************************/
/*!
\class QHttp
+ \obsolete
\reentrant
\brief The QHttp class provides an implementation of the HTTP protocol.
@@ -1422,10 +1423,11 @@ QString QHttpRequestHeader::toString() const
\mainclass
This class provides a direct interface to HTTP that allows you to
- have more control over the requests and that allows you to access
- the response header fields. However, for new applications, it is
+ download and upload data with the HTTP protocol.
+ However, for new applications, it is
recommended to use QNetworkAccessManager and QNetworkReply, as
- those classes possess a simpler, yet more powerful API.
+ those classes possess a simpler, yet more powerful API
+ and a more modern protocol implementation.
The class works asynchronously, so there are no blocking
functions. If an operation cannot be executed immediately, the