fix a mismatch of using QT_NO_NETWORKPROXY
authorJing Bai <jing.t.bai@nokia.com>
Mon, 3 Sep 2012 08:23:34 +0000 (10:23 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 3 Sep 2012 11:41:55 +0000 (13:41 +0200)
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>
src/network/access/qnetworkaccessmanager.cpp

index dd7bfe1..8b3207d 100644 (file)
@@ -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