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

Fix build with proxy config and Qt5

Browse Source 
BUG: 656
This commit is contained in:
craig.p.drummond
2015-03-28 10:39:24 +00:00
committed by craig.p.drummond
parent 630192c2f2
commit 7e6823a43e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
network/networkproxyfactory.cpp
View File

@@ -122,6 +122,15 @@ static QList<QNetworkProxy> systemProxyForQuery(const QNetworkProxyQuery &query)
}
#endif
static QList<QNetworkProxy> getSystemProxyForQuery(const QNetworkProxyQuery &query)
{
#if defined Q_OS_LINUX && QT_VERSION < 0x050000
return ::systemProxyForQuery(query);
#else
return QNetworkProxyFactory::systemProxyForQuery(query);
#endif
}
#ifdef ENABLE_PROXY_CONFIG
NetworkProxyFactory::NetworkProxyFactory()
: mode(Mode_System)
@@ -173,7 +182,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q
switch (mode) {
case Mode_System:
return ::systemProxyForQuery(query);
return getSystemProxyForQuery(query);
case Mode_Direct:
ret.setType(QNetworkProxy::NoProxy);
break;
@@ -191,9 +200,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q
}
return QList<QNetworkProxy>() << ret;
#elif defined Q_OS_LINUX && QT_VERSION < 0x050000
return ::systemProxyForQuery(query);
#else
return QNetworkProxyFactory::systemProxyForQuery(query);
#elif
return getSystemProxyForQuery(query);
#endif
}