summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@nokia.com>2010-12-03 11:39:24 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-12-08 00:37:09 (GMT)
commit2eea05dee36f6ce263a91eae88f1029d2c333988 (patch)
treec72bfd8ebb4c1d8bfa6f009ed4fd19a9ee9eb3d2 /src/plugins
parent783a278f243c6411f5f32d11f2165b9eed9b6f8c (diff)
downloadQt-2eea05dee36f6ce263a91eae88f1029d2c333988.zip
Qt-2eea05dee36f6ce263a91eae88f1029d2c333988.tar.gz
Qt-2eea05dee36f6ce263a91eae88f1029d2c333988.tar.bz2
Proxy mode was not correctly checked.
Fixes: NB#208617 - QtProxyFactory does not return correct (any) proxy data
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/bearer/icd/proxyconf.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/icd/proxyconf.cpp b/src/plugins/bearer/icd/proxyconf.cpp
index 37501fb..efe2da7 100644
--- a/src/plugins/bearer/icd/proxyconf.cpp
+++ b/src/plugins/bearer/icd/proxyconf.cpp
@@ -306,12 +306,12 @@ QList<QNetworkProxy> ProxyConfPrivate::flush(const QNetworkProxyQuery &query)
if (isHostExcluded(query.peerHostName()))
return result; // no proxy for this host
- if (mode == "auto") {
+ if (mode == QLatin1String("AUTO")) {
// TODO: pac currently not supported, fix me
return result;
}
- if (mode == "manual") {
+ if (mode == QLatin1String("MANUAL")) {
bool isHttps = false;
QString protocol = query.protocolTag().toLower();