Apply proxy changes from master

This are the same changes as done in 629038632c,
but only the part related to the config. This is so we don't forget this when
merging them.
This commit is contained in:
Florian Bruhin 2017-07-03 10:10:30 +02:00
parent 07d0ea6a54
commit 252c5396f3
2 changed files with 0 additions and 5 deletions

View File

@ -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.

View File

@ -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.