Mercurial Repositories > eric / changeset

--- a/eric6/UI/UserInterface.py	Sat Nov 02 19:24:46 2019 +0100
+++ b/eric6/UI/UserInterface.py	Mon Nov 04 19:09:08 2019 +0100
@@ -3648,7 +3648,7 @@
             sizeStr = "32-Bit"
         
         versionText = self.tr(
-            """<h3>Version Numbers</h3>"""
+            """<h2>Version Numbers</h2>"""
             """<table>""")
         versionText += (
             """<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>"""
@@ -3659,12 +3659,26 @@
         versionText += (
             """<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""
         ).format(PYQT_VERSION_STR)
+        try:
+            from PyQt5 import QtChart
+            versionText += (
+                """<tr><td><b>PyQtChart</b></td><td>{0}</td></tr>"""
+            ).format(QtChart.PYQT_CHART_VERSION_STR)
+        except (ImportError, AttributeError):
+            pass
+        try:
+            from PyQt5 import QtWebEngine
+            versionText += (
+                """<tr><td><b>PyQtWebEngine</b></td><td>{0}</td></tr>"""
+            ).format(QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
+        except (ImportError, AttributeError):
+            pass
+        versionText += (
+            """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""
+        ).format(QSCINTILLA_VERSION_STR)
         versionText += (
             """<tr><td><b>sip</b></td><td>{0}</td></tr>"""
         ).format(sip_version_str)
-        versionText += (
-            """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""
-        ).format(QSCINTILLA_VERSION_STR)
         try:
             from WebBrowser.Tools import WebBrowserTools
             chromeVersion = WebBrowserTools.getWebEngineVersions()[0]

--- a/eric6/Utilities/__init__.py	Sat Nov 02 19:24:46 2019 +0100
+++ b/eric6/Utilities/__init__.py	Mon Nov 04 19:09:08 2019 +0100
@@ -1927,7 +1927,18 @@
         linesep, sys.version.split()[0], sizeStr, linesep)
     info += "  Qt {0}{1}  PyQt {2}{3}".format(
         qVersion(), linesep, PYQT_VERSION_STR, linesep)
-    info += "  sip {0}{1}  QScintilla {2}{3}".format(
+    try:
+        from PyQt5 import QtChart
+        info += "  PyQtChart {0}".format(QtChart.PYQT_CHART_VERSION_STR)
+    except (ImportError, AttributeError):
+        pass
+    try:
+        from PyQt5 import QtWebEngine
+        info += "  PyQtWebEngine {0}".format(
+            QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
+    except (ImportError, AttributeError):
+        pass
+    info += "  QScintilla {2}{3}  sip {0}{1}".format(
         sip_version_str, linesep, QSCINTILLA_VERSION_STR, linesep)
     try:
         from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__

--- a/scripts/install.py	Sat Nov 02 19:24:46 2019 +0100
+++ b/scripts/install.py	Mon Nov 04 19:09:08 2019 +0100
@@ -1542,6 +1542,17 @@
                 print('Please install another version.')
                 exit(5)
     
+    # print version info for additional modules
+    try:
+        print("PyQtChart:", QtChart.PYQT_CHART_VERSION_STR)
+    except (NameError, AttributeError):
+        pass
+    try:
+        from PyQt5 import QtWebEngine
+        print("PyQtWebEngine.", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
+    except (ImportError, AttributeError):
+        pass
+    
     print("All dependencies ok.")
     print()