Make neochat obey the system-wide proxy settings
This commit is contained in:
committed by
Tobias Fella
parent
4e6850a60c
commit
cae389c04c
@@ -4,6 +4,7 @@
|
|||||||
#include "proxycontroller.h"
|
#include "proxycontroller.h"
|
||||||
|
|
||||||
#include <QNetworkProxy>
|
#include <QNetworkProxy>
|
||||||
|
#include <QNetworkProxyFactory>
|
||||||
|
|
||||||
#include "neochatconfig.h"
|
#include "neochatconfig.h"
|
||||||
|
|
||||||
@@ -15,18 +16,24 @@ void ProxyController::setApplicationProxy()
|
|||||||
switch (cfg->proxyType()) {
|
switch (cfg->proxyType()) {
|
||||||
case 1:
|
case 1:
|
||||||
proxy.setType(QNetworkProxy::HttpProxy);
|
proxy.setType(QNetworkProxy::HttpProxy);
|
||||||
|
proxy.setHostName(cfg->proxyHost());
|
||||||
|
proxy.setPort(cfg->proxyPort());
|
||||||
|
proxy.setUser(cfg->proxyUser());
|
||||||
|
proxy.setPassword(cfg->proxyPassword());
|
||||||
|
QNetworkProxy::setApplicationProxy(proxy);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
proxy.setType(QNetworkProxy::Socks5Proxy);
|
proxy.setType(QNetworkProxy::Socks5Proxy);
|
||||||
|
proxy.setHostName(cfg->proxyHost());
|
||||||
|
proxy.setPort(cfg->proxyPort());
|
||||||
|
proxy.setUser(cfg->proxyUser());
|
||||||
|
proxy.setPassword(cfg->proxyPassword());
|
||||||
|
QNetworkProxy::setApplicationProxy(proxy);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
QNetworkProxyFactory::setUseSystemConfiguration(true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
proxy.setHostName(cfg->proxyHost());
|
|
||||||
proxy.setPort(cfg->proxyPort());
|
|
||||||
proxy.setUser(cfg->proxyUser());
|
|
||||||
proxy.setPassword(cfg->proxyPassword());
|
|
||||||
QNetworkProxy::setApplicationProxy(proxy);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ProxyController::ProxyController(QObject *parent)
|
ProxyController::ProxyController(QObject *parent)
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import QtQuick.Layouts
|
|||||||
|
|
||||||
import org.kde.kirigamiaddons.formcard as FormCard
|
import org.kde.kirigamiaddons.formcard as FormCard
|
||||||
|
|
||||||
|
import org.kde.neochat
|
||||||
|
|
||||||
FormCard.FormCardPage {
|
FormCard.FormCardPage {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user