diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
| commit | 72e5124b8517662ca2cd25deb5806bc04d20c022 (patch) | |
| tree | 5950af37125647a6f14369eab667c7d611d1ac69 /src/network | |
| parent | a19c22ebf8775f73b840f52b7e03869166ca0dab (diff) | |
| parent | a12f6ba302e54c1570c54aa4c722f2dafbf794af (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
tests/auto/opengl/qgl/tst_qgl.cpp
Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 242855eaba..54229295bb 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -706,7 +706,7 @@ quint16 QNetworkProxy::port() const If a QAbstractSocket or QTcpSocket has the QNetworkProxy::DefaultProxy type, then the QNetworkProxy set with this function is used. If you want more flexibility in determining - which the proxy, use the QNetworkProxyFactory class. + which proxy is used, use the QNetworkProxyFactory class. Setting a default proxy value with this function will override the application proxy factory set with |