AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a mismatch of using QT_NO_NETWORKPROXY

Browse Source 
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>
This commit is contained in:
Jing Bai 2012-09-03 10:23:34 +02:00 committed by Qt by Nokia
parent ae2686717e
commit 3981961035
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/access/qnetworkaccessmanager.cpp
View File

@ -1202,6 +1202,8 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QAuthenticator *authen
return; return;
} }
} }
#ifndef QT_NO_NETWORKPROXY
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) #if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
//now we try to get the username and password from keychain //now we try to get the username and password from keychain
//if not successful signal will be emitted //if not successful signal will be emitted
@ -1214,6 +1216,7 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QAuthenticator *authen
return; return;
} }
#endif #endif
#endif //QT_NO_NETWORKPROXY
// if we emit a signal here in synchronous mode, the user might spin // if we emit a signal here in synchronous mode, the user might spin
// an event loop, which might recurse and lead to problems // an event loop, which might recurse and lead to problems