diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2011-12-27 17:20:04 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-28 16:12:56 +0100 |
| commit | 7dffcf8a74de16c977ddff930dd17973d2abdf9d (patch) | |
| tree | 86cc452c60ee7932e9e732f2a1107a79219139e0 /src | |
| parent | b2f22587194c3c2e51a11eb97630ea08e3c2062c (diff) | |
Clarifying the flow of signals on QNetworkAccessManager.
Task-number: QTBUG-22858
Change-Id: I07eaecebf17e73f9c3148465d8970ca7672a900c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 7 | ||||
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 2146749ea5..5b6919bc33 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -285,11 +285,16 @@ static void ensureInitialized() again, without emitting the authenticationRequired() signal. If it rejects the credentials, this signal will be emitted again. + \note To have the request not send credentials you must not call + setUser() or setPassword() on the \a authenticator object. This + will result in the the \l finished() signal being emitted with a + \l QNetworkReply with error \l AuthenticationRequiredError. + \note It is not possible to use a QueuedConnection to connect to this signal, as the connection will fail if the authenticator has not been filled in with new information when the signal returns. - \sa proxyAuthenticationRequired() + \sa proxyAuthenticationRequired(), QAuthenticator::setUser(), QAuthenticator::setPassword() */ /*! diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index ec3abdf029..3fa25368bb 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -206,6 +206,8 @@ QString QAuthenticator::user() const /*! Sets the \a user used for authentication. + + \sa QNetworkAccessManager::authenticationRequired() */ void QAuthenticator::setUser(const QString &user) { @@ -244,6 +246,8 @@ QString QAuthenticator::password() const /*! Sets the \a password used for authentication. + + \sa QNetworkAccessManager::authenticationRequired() */ void QAuthenticator::setPassword(const QString &password) { |