iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Qt5 seems to use env vars for system proxies, so no need for Cantata to do this for Qt5 builds.

Browse Source
This commit is contained in:
craig.p.drummond
2013-06-24 18:47:02 +00:00
committed by craig.p.drummond
parent e06bb3d589
commit 38bbbca498
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
network/networkproxyfactory.cpp
View File

@@ -34,7 +34,7 @@ NetworkProxyFactory::NetworkProxyFactory()
, type(QNetworkProxy::HttpProxy)
, port(8080)
{
#ifdef Q_OS_LINUX
#if defined Q_OS_LINUX && QT_VERSION < 0x050000
// Linux uses environment variables to pass proxy configuration information,
// which systemProxyForQuery doesn't support for some reason.
@@ -89,7 +89,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q
switch (mode) {
case Mode_System:
#ifdef Q_OS_LINUX
#if defined Q_OS_LINUX && QT_VERSION < 0x050000
Q_UNUSED(query);
if (envUrl.isEmpty()) {

2
network/networkproxyfactory.h
View File

@@ -56,7 +56,7 @@ private:
int port;
QString username;
QString password;
#ifdef Q_OS_LINUX
#if defined Q_OS_LINUX && QT_VERSION < 0x050000
QUrl envUrl;
#endif
};