diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-17 18:16:13 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-17 18:16:13 (GMT) |
| commit | 42e342d1b3924206c7fa4175cb064dc2bbe0f00c (patch) | |
| tree | 12f01bb114f956dd257507f0106c39d5a5247a12 /src/network/access | |
| parent | 7332e42363eb93f1de032319439a7250e16b3b12 (diff) | |
| parent | f37c1ea90b4265f1e2b2e7de9bbb0a021ca230d6 (diff) | |
| download | Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.zip Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.gz Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qftp.cpp | 4 | ||||
| -rw-r--r-- | src/network/access/qhttp.cpp | 10 | ||||
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 5d5c978..308037a 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -1294,9 +1294,9 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd) \class QFtp \brief The QFtp class provides an implementation of the client side of FTP protocol. - \ingroup io + \ingroup network \inmodule QtNetwork - \mainclass + This class provides a direct interface to FTP that allows you to have more control over the requests. However, for new diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 9d0b413..e789a9c 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -516,7 +516,7 @@ public: \obsolete \brief The QHttpHeader class contains header information for HTTP. - \ingroup io + \ingroup network \inmodule QtNetwork In most cases you should use the more specialized derivatives of @@ -1011,7 +1011,7 @@ public: \obsolete \brief The QHttpResponseHeader class contains response header information for HTTP. - \ingroup io + \ingroup network \inmodule QtNetwork This class is used by the QHttp class to report the header @@ -1216,7 +1216,7 @@ public: \obsolete \brief The QHttpRequestHeader class contains request header information for HTTP. - \ingroup io + \ingroup network \inmodule QtNetwork This class is used in the QHttp class to report the header @@ -1421,9 +1421,9 @@ QString QHttpRequestHeader::toString() const \brief The QHttp class provides an implementation of the HTTP protocol. - \ingroup io + \ingroup network \inmodule QtNetwork - \mainclass + This class provides a direct interface to HTTP that allows you to download and upload data with the HTTP protocol. diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index cc83e40..721f8c4 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \brief The QNetworkRequest class holds one request to be sent with the Network Access API. \since 4.4 - \ingroup io + \ingroup network \inmodule QtNetwork QNetworkRequest is part of the Network Access API and is the class |