Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserWindow.py	Sat Jan 02 17:28:57 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Sun Jan 03 15:33:39 2021 +0100
@@ -45,7 +45,6 @@
 
 import Utilities
 import Globals
-from Globals import qVersionTuple
 
 import UI.PixmapCache
 import UI.Config
@@ -163,13 +162,6 @@
         self.__eventMouseButtons = Qt.NoButton
         self.__eventKeyboardModifiers = Qt.NoModifier
         
-        if (
-            qVersionTuple() < (5, 11, 0) and
-            Preferences.getWebBrowser("WebInspectorEnabled")
-        ):
-            os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = str(
-                Preferences.getWebBrowser("WebInspectorPort"))
-        
         WebBrowserWindow.setUseQtHelp(qthelp or bool(searchWord))
         
         self.webProfile(private)
@@ -614,77 +606,47 @@
         settings.setAttribute(
             QWebEngineSettings.FullScreenSupportEnabled,
             Preferences.getWebBrowser("FullScreenSupportEnabled"))
-        
-        try:
-            # Qt 5.7
-            settings.setAttribute(
-                QWebEngineSettings.ScreenCaptureEnabled,
-                Preferences.getWebBrowser("ScreenCaptureEnabled"))
-            settings.setAttribute(
-                QWebEngineSettings.WebGLEnabled,
-                Preferences.getWebBrowser("WebGLEnabled"))
-        except (AttributeError, KeyError):
-            pass
-        
-        try:
-            # Qt 5.8
-            settings.setAttribute(
-                QWebEngineSettings.FocusOnNavigationEnabled,
-                Preferences.getWebBrowser("FocusOnNavigationEnabled"))
-            settings.setAttribute(
-                QWebEngineSettings.PrintElementBackgrounds,
-                Preferences.getWebBrowser("PrintElementBackgrounds"))
-            settings.setAttribute(
-                QWebEngineSettings.AllowRunningInsecureContent,
-                Preferences.getWebBrowser("AllowRunningInsecureContent"))
-        except (AttributeError, KeyError):
-            pass
-        
-        try:
-            # Qt 5.9
-            settings.setAttribute(
-                QWebEngineSettings.AllowGeolocationOnInsecureOrigins,
-                Preferences.getWebBrowser("AllowGeolocationOnInsecureOrigins"))
-        except (AttributeError, KeyError):
-            pass
-        
-        try:
-            # Qt 5.10
-            settings.setAttribute(
-                QWebEngineSettings.AllowWindowActivationFromJavaScript,
-                Preferences.getWebBrowser(
-                    "AllowWindowActivationFromJavaScript"))
-            settings.setAttribute(
-                QWebEngineSettings.ShowScrollBars,
-                Preferences.getWebBrowser("ShowScrollBars"))
-        except (AttributeError, KeyError):
-            pass
-        
-        try:
-            # Qt 5.11
-            settings.setAttribute(
-                QWebEngineSettings.PlaybackRequiresUserGesture,
-                Preferences.getWebBrowser(
-                    "PlaybackRequiresUserGesture"))
-            settings.setAttribute(
-                QWebEngineSettings.JavascriptCanPaste,
-                Preferences.getWebBrowser(
-                    "JavaScriptCanPaste"))
-            settings.setAttribute(
-                QWebEngineSettings.WebRTCPublicInterfacesOnly,
-                Preferences.getWebBrowser(
-                    "WebRTCPublicInterfacesOnly"))
-        except (AttributeError, KeyError):
-            pass
-        
-        try:
-            # Qt 5.12
-            settings.setAttribute(
-                QWebEngineSettings.DnsPrefetchEnabled,
-                Preferences.getWebBrowser(
-                    "DnsPrefetchEnabled"))
-        except (AttributeError, KeyError):
-            pass
+        settings.setAttribute(
+            QWebEngineSettings.ScreenCaptureEnabled,
+            Preferences.getWebBrowser("ScreenCaptureEnabled"))
+        settings.setAttribute(
+            QWebEngineSettings.WebGLEnabled,
+            Preferences.getWebBrowser("WebGLEnabled"))
+        settings.setAttribute(
+            QWebEngineSettings.FocusOnNavigationEnabled,
+            Preferences.getWebBrowser("FocusOnNavigationEnabled"))
+        settings.setAttribute(
+            QWebEngineSettings.PrintElementBackgrounds,
+            Preferences.getWebBrowser("PrintElementBackgrounds"))
+        settings.setAttribute(
+            QWebEngineSettings.AllowRunningInsecureContent,
+            Preferences.getWebBrowser("AllowRunningInsecureContent"))
+        settings.setAttribute(
+            QWebEngineSettings.AllowGeolocationOnInsecureOrigins,
+            Preferences.getWebBrowser("AllowGeolocationOnInsecureOrigins"))
+        settings.setAttribute(
+            QWebEngineSettings.AllowWindowActivationFromJavaScript,
+            Preferences.getWebBrowser(
+                "AllowWindowActivationFromJavaScript"))
+        settings.setAttribute(
+            QWebEngineSettings.ShowScrollBars,
+            Preferences.getWebBrowser("ShowScrollBars"))
+        settings.setAttribute(
+            QWebEngineSettings.PlaybackRequiresUserGesture,
+            Preferences.getWebBrowser(
+                "PlaybackRequiresUserGesture"))
+        settings.setAttribute(
+            QWebEngineSettings.JavascriptCanPaste,
+            Preferences.getWebBrowser(
+                "JavaScriptCanPaste"))
+        settings.setAttribute(
+            QWebEngineSettings.WebRTCPublicInterfacesOnly,
+            Preferences.getWebBrowser(
+                "WebRTCPublicInterfacesOnly"))
+        settings.setAttribute(
+            QWebEngineSettings.DnsPrefetchEnabled,
+            Preferences.getWebBrowser(
+                "DnsPrefetchEnabled"))
         
         try:
             # Qt 5.13