Globals: fixed a severe bug.

Sun, 06 Dec 2020 12:46:00 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 06 Dec 2020 12:46:00 +0100
changeset 7861
3d48094ba8e1
parent 7857
5cbae4f7e35a
child 7862
817ef8e0fa66

Globals: fixed a severe bug.

docs/changelog file | annotate | diff | comparison | revisions
eric6/Globals/__init__.py file | annotate | diff | comparison | revisions
--- a/docs/changelog	Sat Dec 05 18:25:56 2020 +0100
+++ b/docs/changelog	Sun Dec 06 12:46:00 2020 +0100
@@ -1,5 +1,8 @@
 Change Log
 ----------
+Version 20.12.1:
+- bug fixes
+
 Version 20.12:
 - bug fixes
 
--- a/eric6/Globals/__init__.py	Sat Dec 05 18:25:56 2020 +0100
+++ b/eric6/Globals/__init__.py	Sun Dec 06 12:46:00 2020 +0100
@@ -318,9 +318,13 @@
     
     # step 2: try the qt5_applications package
     if not path:
-        import qt5_applications
-        path = os.path.join(os.path.dirname(qt5_applications.__file__),
-                            "Qt", "bin")
+        try:
+            import qt5_applications
+            path = os.path.join(os.path.dirname(qt5_applications.__file__),
+                                "Qt", "bin")
+        except ImportError:
+            # qt5-applications is not installed; just go to the next step
+            pass
     
     # step 3: determine from used Python interpreter (designer is test object)
     if not path:

eric ide

mercurial