diff options
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 43 | ||||
| -rw-r--r-- | tools/qdoc3/generator.cpp | 7 |
2 files changed, 20 insertions, 30 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index fa592c2..38cae8b 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -105,7 +105,8 @@ QT_BEGIN_NAMESPACE /*! \enum QNetworkRequest::Attribute - + \since 4.7 + Attribute codes for the QNetworkRequest and QNetworkReply. Attributes are extra meta-data that are used to control the @@ -186,34 +187,28 @@ QT_BEGIN_NAMESPACE \value CustomVerbAttribute Requests only, type: QVariant::ByteArray - Holds the value for the custom HTTP verb to send (destined for usage - of other verbs than GET, POST, PUT and DELETE). This verb is set - when calling QNetworkAccessManager::sendCustomRequest(). + Holds the value for the custom HTTP verb to send (destined for usage + of other verbs than GET, POST, PUT and DELETE). This verb is set + when calling QNetworkAccessManager::sendCustomRequest(). \value CookieLoadControlAttribute - Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) - Indicates whether to send 'Cookie' headers in the request. - - This attribute is set to false by QtWebKit when creating a cross-origin - XMLHttpRequest where withCredentials has not been set explicitly to true by the - Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + Requests only, type: QVariant::Int (default: + QNetworkRequest::Automatic) Indicates whether to send 'Cookie' + headers in the request. This attribute is set to false by + QtWebKit when creating a cross-origin XMLHttpRequest where + withCredentials has not been set explicitly to true by the + Javascript that created the request. See + \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} + {here} for more information. \value CookieSaveControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to save 'Cookie' headers received from the server in reply to the request. - This attribute is set to false by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. \value AuthenticationReuseAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) @@ -221,22 +216,14 @@ QT_BEGIN_NAMESPACE if available. If this is set to QNetworkRequest::Manual and the authentication mechanism is 'Basic' or 'Digest', Qt will not send an an 'Authorization' HTTP header with any cached credentials it may have for the request's URL. - This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. \omitvalue MaximumDownloadBufferSizeAttribute - \since 4.7 - \internal \omitvalue DownloadBufferAttribute - \since 4.7 - \internal \value User Special type. Additional information can be passed in diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 24219a1..7f39be2 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -1068,8 +1068,11 @@ void Generator::generateSince(const Node *node, CodeMarker *marker) Text text; text << Atom::ParaLeft << "This " - << typeString(node) - << " was introduced in "; + << typeString(node); + if (node->type() == Node::Enum) + text << " was introduced or modified in "; + else + text << " was introduced in "; if (project.isEmpty()) text << "version"; else |