Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserPage.py	Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/WebBrowserPage.py	Mon Sep 02 18:50:38 2019 +0200
@@ -27,7 +27,6 @@
 from .Tools import Scripts
 
 import Preferences
-from Globals import qVersionTuple
 
 
 class WebBrowserPage(QWebEnginePage):
@@ -43,11 +42,8 @@
     @signal navigationRequestAccepted(url, navigation type, main frame) emitted
         to signal an accepted navigation request
     """
-    if qVersionTuple() >= (5, 7, 0):
-        SafeJsWorld = QWebEngineScript.ApplicationWorld
-        # SafeJsWorld = QWebEngineScript.MainWorld
-    else:
-        SafeJsWorld = QWebEngineScript.MainWorld
+    SafeJsWorld = QWebEngineScript.ApplicationWorld
+    # SafeJsWorld = QWebEngineScript.MainWorld
     UnsafeJsWorld = QWebEngineScript.MainWorld
     
     safeBrowsingAbort = pyqtSignal()
@@ -79,12 +75,7 @@
             WebBrowserWindow.networkManager().proxyAuthentication)
         self.fullScreenRequested.connect(self.__fullScreenRequested)
         self.urlChanged.connect(self.__urlChanged)
-        
-        try:
-            self.contentsSizeChanged.connect(self.__contentsSizeChanged)
-        except AttributeError:
-            # defined for Qt >= 5.7
-            pass
+        self.contentsSizeChanged.connect(self.__contentsSizeChanged)
         
         try:
             self.registerProtocolHandlerRequested.connect(
@@ -308,7 +299,7 @@
             ended
         @type function
         """
-        if qVersionTuple() >= (5, 7, 0) and worldId > -1:
+        if worldId > -1:
             if callback is None:
                 QWebEnginePage.runJavaScript(self, script, worldId)
             else: