Merge branch 'master' of https://github.com/sbinix/qutebrowser into sbinix-master
Conflicts: qutebrowser/config/websettings.py
This commit is contained in:
commit
706cc1a87f
@ -369,7 +369,10 @@ MAPPINGS = {
|
||||
|
||||
def init():
|
||||
"""Initialize the global QWebSettings."""
|
||||
QWebSettings.setIconDatabasePath(standarddir.cache())
|
||||
if config.get('general', 'private-browsing'):
|
||||
QWebSettings.setIconDatabasePath('')
|
||||
else:
|
||||
QWebSettings.setIconDatabasePath(standarddir.cache())
|
||||
QWebSettings.setOfflineWebApplicationCachePath(
|
||||
os.path.join(standarddir.cache(), 'application-cache'))
|
||||
QWebSettings.globalSettings().setLocalStoragePath(
|
||||
|
Loading…
Reference in New Issue
Block a user