rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't access QWES.globalSettings() on module-level

Browse Source 
Otherwise we implicitly create a webengine context, which means setting
QTWEBENGINE_REMOTE_DEBUGGING won't work anymore.
This commit is contained in:
Florian Bruhin 2016-08-03 15:32:56 +02:00
parent 614893bdd6
commit 61e0c8327a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/browser/webengine/webenginesettings.py
View File

@ -36,23 +36,23 @@ from qutebrowser.utils import objreg, utils
class Attribute(websettings.Attribute): class Attribute(websettings.Attribute):
GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() GLOBAL_SETTINGS = QWebEngineSettings.globalSettings
ENUM_BASE = QWebEngineSettings ENUM_BASE = QWebEngineSettings
class Setter(websettings.Setter): class Setter(websettings.Setter):
GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() GLOBAL_SETTINGS = QWebEngineSettings.globalSettings
class NullStringSetter(websettings.NullStringSetter): class NullStringSetter(websettings.NullStringSetter):
GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() GLOBAL_SETTINGS = QWebEngineSettings.globalSettings
class StaticSetter(websettings.StaticSetter): class StaticSetter(websettings.StaticSetter):
GLOBAL_SETTINGS = QWebEngineSettings.globalSettings() GLOBAL_SETTINGS = QWebEngineSettings.globalSettings
def update_settings(section, option): def update_settings(section, option):

8
qutebrowser/browser/webkit/webkitsettings.py
View File

@ -34,23 +34,23 @@ from qutebrowser.utils import standarddir, objreg
class Attribute(websettings.Attribute): class Attribute(websettings.Attribute):
GLOBAL_SETTINGS = QWebSettings.globalSettings() GLOBAL_SETTINGS = QWebSettings.globalSettings
ENUM_BASE = QWebSettings ENUM_BASE = QWebSettings
class Setter(websettings.Setter): class Setter(websettings.Setter):
GLOBAL_SETTINGS = QWebSettings.globalSettings() GLOBAL_SETTINGS = QWebSettings.globalSettings
class NullStringSetter(websettings.NullStringSetter): class NullStringSetter(websettings.NullStringSetter):
GLOBAL_SETTINGS = QWebSettings.globalSettings() GLOBAL_SETTINGS = QWebSettings.globalSettings
class StaticSetter(websettings.StaticSetter): class StaticSetter(websettings.StaticSetter):
GLOBAL_SETTINGS = QWebSettings.globalSettings() GLOBAL_SETTINGS = QWebSettings.globalSettings
class CookiePolicy(websettings.Base): class CookiePolicy(websettings.Base):

2
qutebrowser/config/websettings.py
View File

@ -48,7 +48,7 @@ class Base:
the global instance. the global instance.
""" """
if settings is None: if settings is None:
return self.GLOBAL_SETTINGS return self.GLOBAL_SETTINGS()
else: else:
return settings return settings