mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proxy: Fix compile harder

Browse Source
This commit is contained in:
Markus Goetz 2015-03-27 10:36:34 +01:00
parent 5483682281
commit cfada67aa6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsync/clientproxy.cpp
View File

@ -51,7 +51,7 @@ bool ClientProxy::isUsingSystemDefault() {
return false;
}
QString printProxy(const QNetworkProxy &proxy)
QString printQNetworkProxy(const QNetworkProxy &proxy)
{
return QString("%1://%2:%3").arg(proxy.type()).arg(proxy.hostName()).arg(proxy.port());
}
@ -80,13 +80,13 @@ void ClientProxy::setupQtProxyFromConfig()
break;
case QNetworkProxy::Socks5Proxy:
proxy.setType(QNetworkProxy::Socks5Proxy);
qDebug() << "Set proxy configuration to SOCKS5" << printProxy(proxy);
qDebug() << "Set proxy configuration to SOCKS5" << printQNetworkProxy(proxy);
QNetworkProxyFactory::setUseSystemConfiguration(false);
QNetworkProxy::setApplicationProxy(proxy);
break;
case QNetworkProxy::HttpProxy:
proxy.setType(QNetworkProxy::HttpProxy);
qDebug() << "Set proxy configuration to HTTP" << printProxy(proxy);
qDebug() << "Set proxy configuration to HTTP" << printQNetworkProxy(proxy);
QNetworkProxyFactory::setUseSystemConfiguration(false);
QNetworkProxy::setApplicationProxy(proxy);
break;

3
src/libsync/clientproxy.h
View File

@ -54,6 +54,9 @@ private:
QUrl _url;
};
QString printQNetworkProxy(const QNetworkProxy &proxy);
}
#endif // CLIENTPROXY_H

2
src/libsync/connectionvalidator.cpp
View File

@ -85,7 +85,7 @@ void ConnectionValidator::systemProxyLookupDone(const QNetworkProxy &proxy) {
}
if (proxy.type() != QNetworkProxy::DefaultProxy) {
qDebug() << Q_FUNC_INFO << "Setting QNAM proxy to be system proxy" << proxy;
qDebug() << Q_FUNC_INFO << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
_account->networkAccessManager()->setProxy(proxy);
}