diff options
| author | con <qtc-committer@nokia.com> | 2011-03-22 08:58:11 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-22 10:07:44 (GMT) |
| commit | dc1f979b7d2d13efd852fd3fa41930f115a9edd1 (patch) | |
| tree | 073e502ab2fed57d9d9058176578c9224c089f66 | |
| parent | 4f19dc5b35ded10cb1ed74b91c47c1bc6a744845 (diff) | |
| download | Qt-dc1f979b7d2d13efd852fd3fa41930f115a9edd1.zip Qt-dc1f979b7d2d13efd852fd3fa41930f115a9edd1.tar.gz Qt-dc1f979b7d2d13efd852fd3fa41930f115a9edd1.tar.bz2 | |
Fix QT_NO_NETWORKPROXY.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| -rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 81410a4..0b4459a 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -131,6 +131,8 @@ static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy) result = key.toEncoded(); } } +#else + Q_UNUSED(proxy) #endif return "http-connection:" + result; @@ -226,11 +228,13 @@ void QHttpThreadDelegate::startRequest() QUrl urlCopy = httpRequest.url(); urlCopy.setPort(urlCopy.port(ssl ? 443 : 80)); +#ifndef QT_NO_NETWORKPROXY if (transparentProxy.type() != QNetworkProxy::NoProxy) cacheKey = makeCacheKey(urlCopy, &transparentProxy); else if (cacheProxy.type() != QNetworkProxy::NoProxy) cacheKey = makeCacheKey(urlCopy, &cacheProxy); else +#endif cacheKey = makeCacheKey(urlCopy, 0); |