From 61e0c8327a6329b3de49018679aa305442df1e82 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 3 Aug 2016 15:32:56 +0200 Subject: [PATCH] Don't access QWES.globalSettings() on module-level Otherwise we implicitly create a webengine context, which means setting QTWEBENGINE_REMOTE_DEBUGGING won't work anymore. --- qutebrowser/browser/webengine/webenginesettings.py | 8 ++++---- qutebrowser/browser/webkit/webkitsettings.py | 8 ++++---- qutebrowser/config/websettings.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index d0841c11b..58cd85520 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -36,23 +36,23 @@ from qutebrowser.utils import objreg, utils class Attribute(websettings.Attribute): - GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() + GLOBAL_SETTINGS = QWebEngineSettings.globalSettings ENUM_BASE = QWebEngineSettings class Setter(websettings.Setter): - GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() + GLOBAL_SETTINGS = QWebEngineSettings.globalSettings class NullStringSetter(websettings.NullStringSetter): - GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() + GLOBAL_SETTINGS = QWebEngineSettings.globalSettings class StaticSetter(websettings.StaticSetter): - GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() + GLOBAL_SETTINGS = QWebEngineSettings.globalSettings def update_settings(section, option): diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py index 7d29453cf..0e8170231 100644 --- a/qutebrowser/browser/webkit/webkitsettings.py +++ b/qutebrowser/browser/webkit/webkitsettings.py @@ -34,23 +34,23 @@ from qutebrowser.utils import standarddir, objreg class Attribute(websettings.Attribute): - GLOBAL_SETTINGS = QWebSettings.globalSettings() + GLOBAL_SETTINGS = QWebSettings.globalSettings ENUM_BASE = QWebSettings class Setter(websettings.Setter): - GLOBAL_SETTINGS = QWebSettings.globalSettings() + GLOBAL_SETTINGS = QWebSettings.globalSettings class NullStringSetter(websettings.NullStringSetter): - GLOBAL_SETTINGS = QWebSettings.globalSettings() + GLOBAL_SETTINGS = QWebSettings.globalSettings class StaticSetter(websettings.StaticSetter): - GLOBAL_SETTINGS = QWebSettings.globalSettings() + GLOBAL_SETTINGS = QWebSettings.globalSettings class CookiePolicy(websettings.Base): diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index d266e7ae5..7093479a2 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -48,7 +48,7 @@ class Base: the global instance. """ if settings is None: - return self.GLOBAL_SETTINGS + return self.GLOBAL_SETTINGS() else: return settings