diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-05-10 09:23:30 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-05-10 09:23:30 (GMT) |
| commit | e81ba9b802d6a5439b672c847aa9741cf3229227 (patch) | |
| tree | ebb7f1e5dbd83279ee60e51be9884a4e57122138 /src/network/access/qnetworkaccessmanager.cpp | |
| parent | e75796dfa58652ec8998227d9f547eea990a0353 (diff) | |
| parent | 19edac88af53eea7f733cabbaee77f9b725b7ea9 (diff) | |
| download | Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.zip Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.gz Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.bz2 | |
Merge branch 'symbian-socket-engine' into staging-master
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 0d7b52a..55d6a7c 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -986,10 +986,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // third step: find a backend priv->backend = d->findBackend(op, request); -#ifndef QT_NO_NETWORKPROXY - QList<QNetworkProxy> proxyList = d->queryProxy(QNetworkProxyQuery(request.url())); - priv->proxyList = proxyList; -#endif if (priv->backend) { priv->backend->setParent(reply); priv->backend->reply = priv; |