diff -r 68af0e9c57ad -r ee81081a0ff7 Project/ProjectResourcesBrowser.py
--- a/Project/ProjectResourcesBrowser.py Sun Apr 09 19:41:35 2017 +0200
+++ b/Project/ProjectResourcesBrowser.py Mon Apr 10 19:14:40 2017 +0200
@@ -530,7 +530,7 @@
def __readStdout(self):
"""
Private slot to handle the readyReadStandardOutput signal of the
- pyrcc4/rbrcc process.
+ pyrcc4/pyrcc5/pyside-rcc/rbrcc process.
"""
if self.compileProc is None:
return
@@ -544,7 +544,7 @@
def __readStderr(self):
"""
Private slot to handle the readyReadStandardError signal of the
- pyrcc4/rbrcc process.
+ pyrcc4/pyrcc5/pyside-rcc/rbrcc process.
"""
if self.compileProc is None:
return
@@ -633,10 +633,7 @@
if self.project.getProjectLanguage() in \
["Python", "Python2", "Python3"]:
if self.project.getProjectType() in ["Qt4", "Qt4C"]:
- self.rccCompiler = 'pyrcc4'
- if Utilities.isWindowsPlatform():
- self.rccCompiler = \
- Utilities.getWindowsExecutablePath(self.rccCompiler)
+ self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
if PYQT_VERSION >= 0x040500:
if self.project.getProjectLanguage() in \
["Python", "Python2"]:
@@ -644,23 +641,17 @@
else:
args.append("-py3")
elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
- self.rccCompiler = 'pyrcc5'
- if Utilities.isWindowsPlatform():
- self.rccCompiler = \
- Utilities.getWindowsExecutablePath(self.rccCompiler)
+ self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
elif self.project.getProjectType() in ["E6Plugin"]:
if PYQT_VERSION < 0x050000:
- self.rccCompiler = 'pyrcc4'
+ self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
if self.project.getProjectLanguage() in \
["Python", "Python2"]:
args.append("-py2")
else:
args.append("-py3")
else:
- self.rccCompiler = 'pyrcc5'
- if Utilities.isWindowsPlatform():
- self.rccCompiler = \
- Utilities.getWindowsExecutablePath(self.rccCompiler)
+ self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
elif self.project.getProjectType() in ["PySide", "PySideC"]:
self.rccCompiler = Utilities.generatePySideToolPath(
'pyside-rcc')
