summaryrefslogtreecommitdiffstats
path: root/src/network/kernel/qnetworkproxy.cpp
diff options
context:
space:
mode:
authorAndrey Leonov <aleonov@rim.com>2012-10-04 19:37:00 -0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-08 11:14:28 +0200
commite4a6f44ce1a35986c445c40ff2793456782f58fa (patch)
treef6d6f8e931d28c07551f222a19db74448e77f85a /src/network/kernel/qnetworkproxy.cpp
parentf884a73fcbf4012a086a7b471b7914c2ef1ae68d (diff)
Implementation of the BlackBerry Qt Proxy support.
An implementation for BlackBerry devices based on the BPS netstatus API. Change-Id: I89deed031d2a867bbd6628bee97f61345b58f1ab Reviewed-by: Peter Hartmann <phartmann@rim.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/network/kernel/qnetworkproxy.cpp')
-rw-r--r--src/network/kernel/qnetworkproxy.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index a20b2b844d..adaefac440 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1534,6 +1534,12 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
SOCKS server for all queries. If SOCKS isn't enabled, it will use
the HTTPS proxy for all TcpSocket and UrlRequest queries.
+ On BlackBerry, this function obtains proxy settings for the default
+ configuration using system configuration. The type will be set based on
+ protocol tag "http", "https", "ftp", respectively. By default, it
+ assumes http type. Proxy username and password are also set during
+ the query using system configuration.
+
On other systems, this function will pick up proxy settings from
the "http_proxy" environment variable. This variable must be a URL
using one of the following schemes: "http", "socks5" or "socks5h".
@@ -1550,6 +1556,11 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
\li On Windows platforms, this function may take several seconds to
execute depending on the configuration of the user's system.
+
+ \li On BlackBerry, this function ignores network configuration specified
+ in \a query. Only UrlRequest quieries are supported. SOCKS is not supported.
+ The proxy information is retrieved only for the default configuration.
+ Also, PAC and exclusion lists are currently not supported.
\endlist
*/