eric6_tray.py

changeset 4986
248b5a87158d
parent 4631
5c1a96925da4
child 5389
9b1c800daff3
--- a/eric6_tray.py	Sat May 21 19:16:12 2016 +0200
+++ b/eric6_tray.py	Sun May 22 13:02:44 2016 +0200
@@ -42,6 +42,16 @@
                           SettingsDir)
         sys.argv.remove(arg)
 
+from PyQt5.QtCore import qVersion
+if qVersion() < "5.6.0":
+    WEBENGINE_AVAILABLE = False
+else:
+    try:
+        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        WEBENGINE_AVAILABLE = True
+    except ImportError:
+        WEBENGINE_AVAILABLE = False
+
 from Globals import AppInfo
 
 from Toolbox import Startup
@@ -54,10 +64,8 @@
     @param argv list of commandline parameters (list of strings)
     @return reference to the main widget (QWidget)
     """
-    global PyQt4Option
-    
     from Tools.TrayStarter import TrayStarter
-    return TrayStarter(PyQt4Option, SettingsDir)
+    return TrayStarter(PyQt4Option, SettingsDir, webEngine=WEBENGINE_AVAILABLE)
 
 
 def main():

eric ide

mercurial