From cae389c04c590d6f26bc62c12535767dd2595c13 Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Wed, 24 Apr 2024 22:12:18 +0200 Subject: [PATCH] Make neochat obey the system-wide proxy settings --- src/proxycontroller.cpp | 17 ++++++++++++----- src/settings/NetworkProxyPage.qml | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/proxycontroller.cpp b/src/proxycontroller.cpp index d9485b08f..daad86e65 100644 --- a/src/proxycontroller.cpp +++ b/src/proxycontroller.cpp @@ -4,6 +4,7 @@ #include "proxycontroller.h" #include +#include #include "neochatconfig.h" @@ -15,18 +16,24 @@ void ProxyController::setApplicationProxy() switch (cfg->proxyType()) { case 1: proxy.setType(QNetworkProxy::HttpProxy); + proxy.setHostName(cfg->proxyHost()); + proxy.setPort(cfg->proxyPort()); + proxy.setUser(cfg->proxyUser()); + proxy.setPassword(cfg->proxyPassword()); + QNetworkProxy::setApplicationProxy(proxy); break; case 2: proxy.setType(QNetworkProxy::Socks5Proxy); + proxy.setHostName(cfg->proxyHost()); + proxy.setPort(cfg->proxyPort()); + proxy.setUser(cfg->proxyUser()); + proxy.setPassword(cfg->proxyPassword()); + QNetworkProxy::setApplicationProxy(proxy); break; default: + QNetworkProxyFactory::setUseSystemConfiguration(true); break; } - proxy.setHostName(cfg->proxyHost()); - proxy.setPort(cfg->proxyPort()); - proxy.setUser(cfg->proxyUser()); - proxy.setPassword(cfg->proxyPassword()); - QNetworkProxy::setApplicationProxy(proxy); } ProxyController::ProxyController(QObject *parent) diff --git a/src/settings/NetworkProxyPage.qml b/src/settings/NetworkProxyPage.qml index 926c6d45d..0df9d7c69 100644 --- a/src/settings/NetworkProxyPage.qml +++ b/src/settings/NetworkProxyPage.qml @@ -7,6 +7,8 @@ import QtQuick.Layouts import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.neochat + FormCard.FormCardPage { id: root