From 252c5396f3f24d596bfdc9bf2f77c2a9e13c9e40 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 3 Jul 2017 10:10:30 +0200 Subject: [PATCH] Apply proxy changes from master This are the same changes as done in 629038632c6cc8c0ecd8b6a7a32d59ef4d5b9d02, but only the part related to the config. This is so we don't forget this when merging them. --- doc/help/settings.asciidoc | 2 -- qutebrowser/config/configdata.yml | 3 --- 2 files changed, 5 deletions(-) diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index d53d3eabc..2b1571c68 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -1346,8 +1346,6 @@ Valid values: Default: +pass:[system]+ -On QtWebEngine, this setting requires Qt 5.8 or newer. - [[content.proxy_dns_requests]] == content.proxy_dns_requests Whether to send DNS requests over the configured proxy. diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index f1b446a81..545a09340 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -422,9 +422,6 @@ content.private_browsing: content.proxy: default: system type: Proxy - backend: - QtWebKit: true - QtWebEngine: Qt 5.8 desc: >- The proxy to use.