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 · Aug 3, 2016 · 61e0c83 · 61e0c83
1 parent 614893b
commit 61e0c83
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
@@ -36,23 +36,23 @@
 
 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
@@ -34,23 +34,23 @@
 
 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
@@ -48,7 +48,7 @@ def _get_settings(self, settings):
                       the global instance.
         """
         if settings is None:
-            return self.GLOBAL_SETTINGS
+            return self.GLOBAL_SETTINGS()
         else:
             return settings