Mercurial Repositories > eric / file diff

--- a/Project/ProjectFormsBrowser.py	Mon May 04 19:42:53 2015 +0200
+++ b/Project/ProjectFormsBrowser.py	Sat May 09 13:41:45 2015 +0200
@@ -17,7 +17,7 @@
 import sys
 import shutil
 
-from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
+from PyQt5.QtCore import PYQT_VERSION, QThread, QFileInfo, pyqtSignal, QProcess
 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu
 
 from E5Gui.E5Application import e5App
@@ -755,12 +755,21 @@
                     uic = self.uicompiler + '.bat'
                 else:
                     uic = self.uicompiler
-            elif self.project.getProjectType() in ["PyQt5", "E6Plugin"]:
+            elif self.project.getProjectType() in ["PyQt5"]:
                 self.uicompiler = 'pyuic5'
                 if Utilities.isWindowsPlatform():
                     uic = self.uicompiler + '.bat'
                 else:
                     uic = self.uicompiler
+            elif self.project.getProjectType() in ["E6Plugin"]:
+                if PYQT_VERSION < 0x050000:
+                    self.uicompiler = 'pyuic4'
+                else:
+                    self.uicompiler = 'pyuic5'
+                if Utilities.isWindowsPlatform():
+                    uic = self.uicompiler + '.bat'
+                else:
+                    uic = self.uicompiler
             elif self.project.getProjectType() == "PySide":
                 self.uicompiler = 'pyside-uic'
                 uic = Utilities.generatePySideToolPath(self.uicompiler)