Mercurial Repositories > eric / file diff

--- a/Project/ProjectFormsBrowser.py	Sun Apr 09 19:41:35 2017 +0200
+++ b/Project/ProjectFormsBrowser.py	Mon Apr 10 19:14:40 2017 +0200
@@ -642,7 +642,7 @@
     def __readStdout(self):
         """
         Private slot to handle the readyReadStandardOutput signal of the
-        pyuic/rbuic process.
+        pyuic4/pyuic5/pyside-uic/rbuic4 process.
         """
         if self.compileProc is None:
             return
@@ -655,7 +655,7 @@
     def __readStderr(self):
         """
         Private slot to handle the readyReadStandardError signal of the
-        pyuic/rbuic process.
+        pyuic4/pyuic5/pyside-uic/rbuic4 process.
         """
         if self.compileProc is None:
             return
@@ -750,38 +750,25 @@
         if self.project.getProjectLanguage() in \
                 ["Python", "Python2", "Python3"]:
             if self.project.getProjectType() in ["Qt4", ]:
-                self.uicompiler = 'pyuic4'
-                if Utilities.isWindowsPlatform():
-                    uic = Utilities.getWindowsExecutablePath(self.uicompiler)
-                else:
-                    uic = self.uicompiler
+                self.uicompiler = Utilities.generatePyQtToolPath('pyuic4')
             elif self.project.getProjectType() in ["PyQt5"]:
-                self.uicompiler = 'pyuic5'
-                if Utilities.isWindowsPlatform():
-                    uic = Utilities.getWindowsExecutablePath(self.uicompiler)
-                else:
-                    uic = self.uicompiler
+                self.uicompiler = Utilities.generatePyQtToolPath('pyuic5')
             elif self.project.getProjectType() in ["E6Plugin"]:
                 if PYQT_VERSION < 0x050000:
-                    self.uicompiler = 'pyuic4'
+                    self.uicompiler = Utilities.generatePyQtToolPath('pyuic4')
                 else:
-                    self.uicompiler = 'pyuic5'
-                if Utilities.isWindowsPlatform():
-                    uic = Utilities.getWindowsExecutablePath(self.uicompiler)
-                else:
-                    uic = self.uicompiler
+                    self.uicompiler = Utilities.generatePyQtToolPath('pyuic5')
             elif self.project.getProjectType() == "PySide":
-                self.uicompiler = 'pyside-uic'
-                uic = Utilities.generatePySideToolPath(self.uicompiler)
+                self.uicompiler = \
+                    Utilities.generatePySideToolPath('pyside-uic')
             else:
                 return None
         elif self.project.getProjectLanguage() == "Ruby":
             if self.project.getProjectType() == "Qt4":
                 self.uicompiler = 'rbuic4'
                 if Utilities.isWindowsPlatform():
-                    uic = Utilities.getWindowsExecutablePath(self.uicompiler)
-                else:
-                    uic = self.uicompiler
+                    self.uicompiler = \
+                        Utilities.getWindowsExecutablePath(self.uicompiler)
             else:
                 return None
         else:
@@ -810,7 +797,7 @@
         self.compileProc.readyReadStandardError.connect(self.__readStderr)
         
         self.noDialog = noDialog
-        self.compileProc.start(uic, args)
+        self.compileProc.start(self.uicompiler, args)
         procStarted = self.compileProc.waitForStarted(5000)
         if procStarted:
             self.compileRunning = True