Mercurial Repositories > eric / changeset

--- a/Preferences/__init__.py	Tue Oct 04 18:06:43 2016 +0200
+++ b/Preferences/__init__.py	Tue Oct 04 18:09:31 2016 +0200
@@ -1099,7 +1099,7 @@
         if QWebEngineSettings is None:
             return
         
-        webEngineSettings = QWebEngineSettings.globalSettings()
+        webEngineSettings = QWebEngineSettings.defaultSettings()
         cls.webBrowserDefaults.update({
             "StandardFontFamily": webEngineSettings.fontFamily(
                 QWebEngineSettings.StandardFont),

--- a/WebBrowser/StatusBar/ImagesIcon.py	Tue Oct 04 18:06:43 2016 +0200
+++ b/WebBrowser/StatusBar/ImagesIcon.py	Tue Oct 04 18:09:31 2016 +0200
@@ -124,7 +124,7 @@
         @param enable flag indicating the state to set
         @type bool
         """
-        QWebEngineSettings.globalSettings().setAttribute(
+        QWebEngineSettings.defaultSettings().setAttribute(
             QWebEngineSettings.AutoLoadImages, enable)
         Preferences.setWebBrowser("AutoLoadImages", enable)
         

--- a/WebBrowser/WebBrowserWindow.py	Tue Oct 04 18:06:43 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Tue Oct 04 18:09:31 2016 +0200
@@ -430,7 +430,7 @@
         """
         Private method to set the global web settings.
         """
-        settings = QWebEngineSettings.globalSettings()
+        settings = QWebEngineSettings.defaultSettings()
         
         settings.setFontFamily(
             QWebEngineSettings.StandardFont,
@@ -3717,7 +3717,7 @@
         codecs.sort()
         
         defaultTextEncoding = \
-            QWebEngineSettings.globalSettings().defaultTextEncoding().lower()
+            QWebEngineSettings.defaultSettings().defaultTextEncoding().lower()
         if defaultTextEncoding in codecs:
             currentCodec = defaultTextEncoding
         else:
@@ -3772,9 +3772,9 @@
         """
         codec = act.data()
         if codec == "":
-            QWebEngineSettings.globalSettings().setDefaultTextEncoding("")
+            QWebEngineSettings.defaultSettings().setDefaultTextEncoding("")
         else:
-            QWebEngineSettings.globalSettings().setDefaultTextEncoding(codec)
+            QWebEngineSettings.defaultSettings().setDefaultTextEncoding(codec)
     
     def eventMouseButtons(self):
         """