From 39819610354bffb93c277d3b2a6ee9273582aa6e Mon Sep 17 00:00:00 2001 From: Jing Bai Date: Mon, 3 Sep 2012 10:23:34 +0200 Subject: [PATCH] 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 Reviewed-by: Olivier Goffart --- src/network/access/qnetworkaccessmanager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index dd7bfe1..8b3207d 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 -- 2.7.4