WebBrowser/WebBrowserPage.py

changeset 5736
000ea446ff4b
parent 5716
27a7c7064686
child 5774
a559df54a729
--- a/WebBrowser/WebBrowserPage.py	Sat May 13 13:46:05 2017 +0200
+++ b/WebBrowser/WebBrowserPage.py	Sat May 13 16:32:54 2017 +0200
@@ -14,7 +14,7 @@
 except NameError:
     pass
 
-from PyQt5.QtCore import pyqtSlot, qVersion, QUrl, QTimer, QEventLoop, QPoint
+from PyQt5.QtCore import pyqtSlot, QUrl, QTimer, QEventLoop, QPoint
 from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineSettings, \
     QWebEngineScript
@@ -27,13 +27,14 @@
 from .Tools.WebHitTestResult import WebHitTestResult
 
 import Preferences
+from Globals import qVersionTuple
 
 
 class WebBrowserPage(QWebEnginePage):
     """
     Class implementing an enhanced web page.
     """
-    if qVersion() >= "5.7.0":
+    if qVersionTuple() >= (5, 7, 0):
         # SafeJsWorld = QWebEngineScript.ApplicationWorld
         SafeJsWorld = QWebEngineScript.MainWorld
     else:
@@ -203,7 +204,7 @@
             ended
         @type function
         """
-        if qVersion() >= "5.7.0" and worldId > -1:
+        if qVersionTuple() >= (5, 7, 0) and worldId > -1:
             if callback is None:
                 QWebEnginePage.runJavaScript(self, script, worldId)
             else:

eric ide

mercurial