Mercurial Repositories > eric / file diff

--- a/eric6/Utilities/__init__.py	Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Utilities/__init__.py	Tue Dec 22 19:59:29 2020 +0100
@@ -1815,6 +1815,8 @@
     @return the PySide2 tool path with extension
     @rtype str
     """
+    # TODO: add support for pyside6
+    
     if variant == 1:
         # no PySide support anymore
         return ""
@@ -1824,9 +1826,13 @@
         if not hasPyside:
             return ""
         
-        venvName = Preferences.getDebugger("Python3VirtualEnv")
+        venvName = Preferences.getQt("PySide{0}VenvName".format(variant))
+        if not venvName:
+            venvName = Preferences.getDebugger("Python3VirtualEnv")
         interpreter = e5App().getObject(
             "VirtualEnvManager").getVirtualenvInterpreter(venvName)
+        if interpreter == "" or not isinpath(interpreter):
+            interpreter = sys.executable
         prefix = os.path.dirname(interpreter)
         if toolname in ["pyside2-uic"]:
             return os.path.join(prefix, "Scripts", toolname + '.exe')
@@ -1871,24 +1877,26 @@
     """
     if variant == 1:
         # no longer supported PySide
-        return [False, False]
+        return False
     
-    venvName = Preferences.getDebugger("Python3VirtualEnv")
+    venvName = Preferences.getQt("PySide{0}VenvName".format(variant))
+    if not venvName:
+        venvName = Preferences.getDebugger("Python3VirtualEnv")
     interpreter = e5App().getObject(
         "VirtualEnvManager").getVirtualenvInterpreter(venvName)
     if interpreter == "" or not isinpath(interpreter):
-        return False
-    else:
-        checker = os.path.join(
-            getConfig('ericDir'), "Utilities", "PySideImporter.py")
-        args = [checker, "-" + variant]
-        proc = QProcess()
-        proc.setProcessChannelMode(QProcess.MergedChannels)
-        proc.start(interpreter, args)
-        finished = proc.waitForFinished(30000)
-        if finished:
-            if proc.exitCode() == 0:
-                return True
+        interpreter = sys.executable
+    
+    checker = os.path.join(
+        getConfig('ericDir'), "Utilities", "PySideImporter.py")
+    args = [checker, "-" + variant]
+    proc = QProcess()
+    proc.setProcessChannelMode(QProcess.MergedChannels)
+    proc.start(interpreter, args)
+    finished = proc.waitForFinished(30000)
+    if finished:
+        if proc.exitCode() == 0:
+            return True
     
     return False