diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2014-06-23 10:20:07 +0200 |
|---|---|---|
| committer | Peter Hartmann <phartmann@blackberry.com> | 2014-06-23 21:43:17 +0200 |
| commit | f46ce0a0b819b74c4f25b5d9fcbb8a83b62dd417 (patch) | |
| tree | b8a5f0b949020c7cd5b2dd09d8a480d6b16f80ac /src/network/access/qnetworkaccessmanager_p.h | |
| parent | a5f3df04afecd1f4ec347f7fb1b6522ff31ca680 (diff) | |
Mac networking: check system keychain for proxy auth
... and not when normal HTTP authentication is required. Also,
query the system keychain for the right credentials depending
on the URL scheme.
Task-number: QTBUG-30434
Change-Id: Ib6f74029b2e0de9734497440e3b0e48cdf73adcb
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager_p.h')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index 292755e7eb..9528330aae 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -113,7 +113,8 @@ public: const QAuthenticator *auth = 0); #ifndef QT_NO_NETWORKPROXY - void proxyAuthenticationRequired(const QNetworkProxy &proxy, + void proxyAuthenticationRequired(const QUrl &url, + const QNetworkProxy &proxy, bool synchronous, QAuthenticator *authenticator, QNetworkProxy *lastProxyAuthentication); |