diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:24:19 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:24:19 (GMT) |
| commit | 1433a2c8682cb1c8f89ceaf97ad7a509ac686879 (patch) | |
| tree | dc2e5de107f030c3b946219d8614c8b5d42454ff /src/network/kernel | |
| parent | bb3bfd01c1e8797a5a6c5ba553deca11c5ad246c (diff) | |
| parent | e7a92a1b9ff31cf036982bee1221d7e7cb3aea6a (diff) | |
| download | Qt-1433a2c8682cb1c8f89ceaf97ad7a509ac686879.zip Qt-1433a2c8682cb1c8f89ceaf97ad7a509ac686879.tar.gz Qt-1433a2c8682cb1c8f89ceaf97ad7a509ac686879.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/egl/qegl_symbian.cpp
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index c3b89ed..6f92424 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -399,7 +399,12 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro if (isBypassed(query.peerHostName(), sp->proxyBypass)) return sp->defaultResult; - return parseServerList(query, sp->proxyServerList); + QList<QNetworkProxy> result = parseServerList(query, sp->proxyServerList); + // In some cases, this was empty. See SF task 00062670 + if (result.isEmpty()) + return sp->defaultResult; + + return result; } QT_END_NAMESPACE |