Mercurial Repositories > eric / changeset

--- a/UI/UserInterface.py	Sat Mar 05 19:52:00 2016 +0100
+++ b/UI/UserInterface.py	Sun Mar 06 13:31:05 2016 +0100
@@ -3017,13 +3017,16 @@
             .format(sip_version_str)
         versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\
             .format(QSCINTILLA_VERSION_STR)
-        try:
+        if WEBENGINE_AVAILABLE:
+            from WebBrowser.Tools import WebBrowserTools
+            chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
+            versionText += \
+                """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\
+                .format(chromeVersion)
+        if WEBKIT_AVAILABLE:
             from PyQt5.QtWebKit import qWebKitVersion
             versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\
                 .format(qWebKitVersion())
-        except ImportError:
-            pass
-        # TODO: add QtWebEngine version info
         versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\
             .format(Program, Version)
         versionText += self.tr("""</table>""")

--- a/Utilities/__init__.py	Sat Mar 05 19:52:00 2016 +0100
+++ b/Utilities/__init__.py	Sun Mar 06 13:31:05 2016 +0100
@@ -1682,6 +1682,15 @@
         qVersion(), linesep, PYQT_VERSION_STR, linesep)
     info += "  sip {0}{1}  QScintilla {2}{3}".format(
         sip_version_str, linesep, QSCINTILLA_VERSION_STR, linesep)
+    # TODO: adjust this to 5.6.0 when done
+    if qVersion() >= "5.5.0":
+        try:
+            from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+            from WebBrowser.Tools import WebBrowserTools
+            chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
+            info += "  WebEngine {0}{1}".format(chromeVersion, linesep)
+        except ImportError:
+            pass
     try:
         from PyQt5.QtWebKit import qWebKitVersion
         info += "  WebKit {0}{1}".format(qWebKitVersion(), linesep)