Mercurial Repositories > eric / changeset

--- a/eric6/Globals/__init__.py	Thu Nov 19 17:41:58 2020 +0100
+++ b/eric6/Globals/__init__.py	Sat Nov 21 19:31:16 2020 +0100
@@ -316,7 +316,13 @@
     # step 1: check, if the user has configured a tools path
     path = Preferences.getQt("QtToolsDir")
     
-    # step 2: determine from used Python interpreter (designer is test object)
+    # 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")
+    
+    # step 3: determine from used Python interpreter (designer is test object)
     if not path:
         program = "designer"
         if isWindowsPlatform():

--- a/eric6/Utilities/__init__.py	Thu Nov 19 17:41:58 2020 +0100
+++ b/eric6/Utilities/__init__.py	Sat Nov 21 19:31:16 2020 +0100
@@ -724,7 +724,7 @@
     @return path with converted separator characters (string)
     """
     return QDir.toNativeSeparators(path)
-    
+
 
 def fromNativeSeparators(path):
     """
@@ -734,8 +734,9 @@
     @return path with converted separator characters (string)
     """
     return QDir.fromNativeSeparators(path)
-    
+
 
+# TODO: check which path functions are already covered by Python 3
 def normcasepath(path):
     """
     Function returning a path, that is normalized with respect to its case
@@ -745,7 +746,7 @@
     @return case normalized path (string)
     """
     return os.path.normcase(os.path.normpath(path))
-    
+
 
 def normabspath(path):
     """
@@ -755,7 +756,7 @@
     @return absolute, normalized path (string)
     """
     return os.path.abspath(path)
-    
+
 
 def normcaseabspath(path):
     """
@@ -766,7 +767,7 @@
     @return absolute, normalized path (string)
     """
     return os.path.normcase(os.path.abspath(path))
-    
+
 
 def normjoinpath(a, *p):
     """
@@ -777,7 +778,7 @@
     @return normalized path (string)
     """
     return os.path.normpath(os.path.join(a, *p))
-    
+
 
 def normabsjoinpath(a, *p):
     """
@@ -789,7 +790,7 @@
     @return absolute, normalized path (string)
     """
     return os.path.abspath(os.path.join(a, *p))
-    
+
 
 def relpath(path, start=os.path.curdir):
     """

--- a/scripts/install.py	Thu Nov 19 17:41:58 2020 +0100
+++ b/scripts/install.py	Sat Nov 21 19:31:16 2020 +0100
@@ -160,7 +160,8 @@
     if sys.platform.startswith(("win", "cygwin")):
         print("    --clean-desktop delete desktop links before installation")
     if sys.platform != "darwin":
-        print("    --no-tools don't ask for installation of pyqt5-tools")
+        print("    --no-tools don't ask for installation of pyqt5-tools"
+              "/qt5-applications")
     print("    -x         don't perform dependency checks (use on your own"
           " risk)")
     print("    -z         don't compile the installed python files")
@@ -1532,7 +1533,7 @@
     ]
     optionalModulesList = {}
     if sys.platform != "darwin" and not ignorePyqt5Tools:
-        optionalModulesList["pyqt5-tools"] = "pyqt5_tools"
+        optionalModulesList["qt5-applications"] = "qt5_applications"
     
     # check mandatory modules
     modulesOK = True