Mercurial Repositories > eric / changeset
changeset
The logic for the selection of PyQt tools in the various project browsers now depends on the PyQt version used to execute eric.
Sat, 09 May 2015 13:41:45 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 09 May 2015 13:41:45 +0200
- branch
- 6_0_x
- changeset 4251
- 5bc24c67385a
- parent 4248
- 5a413ab0f6a3
- child 4252
- ea05b52a278f
The logic for the selection of PyQt tools in the various project browsers now depends on the PyQt version used to execute eric.
(grafted from ec015f3b8fdb7392ca09ddc754b49c3a7132daf8)
--- 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)
--- a/Project/ProjectResourcesBrowser.py Mon May 04 19:42:53 2015 +0200 +++ b/Project/ProjectResourcesBrowser.py Sat May 09 13:41:45 2015 +0200 @@ -642,11 +642,22 @@ args.append("-py2") else: args.append("-py3") - elif self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin"]: + elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: self.rccCompiler = 'pyrcc5' if Utilities.isWindowsPlatform(): self.rccCompiler += '.exe' + elif self.project.getProjectType() in ["E6Plugin"]: + if PYQT_VERSION < 0x050000: + self.rccCompiler = 'pyrcc4' + if self.project.pdata["PROGLANGUAGE"][0] in \ + ["Python", "Python2"]: + args.append("-py2") + else: + args.append("-py3") + else: + self.rccCompiler = 'pyrcc5' + if Utilities.isWindowsPlatform(): + self.rccCompiler += '.exe' elif self.project.getProjectType() in ["PySide", "PySideC"]: self.rccCompiler = Utilities.generatePySideToolPath( 'pyside-rcc')
--- a/Project/ProjectTranslationsBrowser.py Mon May 04 19:42:53 2015 +0200 +++ b/Project/ProjectTranslationsBrowser.py Sat May 09 13:41:45 2015 +0200 @@ -18,7 +18,7 @@ import shutil import fnmatch -from PyQt5.QtCore import pyqtSignal, QProcess +from PyQt5.QtCore import PYQT_VERSION, pyqtSignal, QProcess from PyQt5.QtWidgets import QDialog, QMenu from E5Gui import E5MessageBox @@ -1035,10 +1035,17 @@ self.pylupdate = 'pylupdate4' if Utilities.isWindowsPlatform(): self.pylupdate = self.pylupdate + '.exe' - elif self.project.getProjectType() in ["PyQt5", "PyQt5C", "E6Plugin"]: + elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: self.pylupdate = 'pylupdate5' if Utilities.isWindowsPlatform(): self.pylupdate = self.pylupdate + '.exe' + elif self.project.getProjectType() in ["E6Plugin"]: + if PYQT_VERSION < 0x050000: + self.pylupdate = 'pylupdate4' + else: + self.pylupdate = 'pylupdate5' + if Utilities.isWindowsPlatform(): + self.pylupdate = self.pylupdate + '.exe' elif self.project.getProjectType() in ["PySide", "PySideC"]: self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate') else:
