diff options
| author | Jing Bai <jing.t.bai@nokia.com> | 2012-09-03 10:23:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 13:41:55 +0200 |
| commit | 39819610354bffb93c277d3b2a6ee9273582aa6e (patch) | |
| tree | 7e4eb09b92509f0f4a76029dfd7ec5c5cd38455e /src/network | |
| parent | ae2686717e51736fd207e4e40d1ebd204d4aa3c0 (diff) | |
fix a mismatch of using QT_NO_NETWORKPROXY
To fix a compile error when QT_NO_NETWORKPROXY is defined.
Change-Id: If0433387cff2e6574fe24721a0ce2bfc41b0eb47
Reviewed-by: Markus Goetz <markus@woboq.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index dd7bfe1bfc..8b3207dc46 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1202,6 +1202,8 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QAuthenticator *authen return; } } + +#ifndef QT_NO_NETWORKPROXY #if defined(Q_OS_MAC) && !defined(Q_OS_IOS) //now we try to get the username and password from keychain //if not successful signal will be emitted @@ -1214,6 +1216,7 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QAuthenticator *authen return; } #endif +#endif //QT_NO_NETWORKPROXY // if we emit a signal here in synchronous mode, the user might spin // an event loop, which might recurse and lead to problems |