633 if self.project.getProjectLanguage() in \ |
633 if self.project.getProjectLanguage() in \ |
634 ["Python", "Python2", "Python3"]: |
634 ["Python", "Python2", "Python3"]: |
635 if self.project.getProjectType() in ["Qt4", "Qt4C"]: |
635 if self.project.getProjectType() in ["Qt4", "Qt4C"]: |
636 self.rccCompiler = 'pyrcc4' |
636 self.rccCompiler = 'pyrcc4' |
637 if Utilities.isWindowsPlatform(): |
637 if Utilities.isWindowsPlatform(): |
638 self.rccCompiler += '.exe' |
638 self.rccCompiler = \ |
|
639 Utilities.getWindowsExecutablePath(self.rccCompiler) |
639 if PYQT_VERSION >= 0x040500: |
640 if PYQT_VERSION >= 0x040500: |
640 if self.project.getProjectLanguage() in \ |
641 if self.project.getProjectLanguage() in \ |
641 ["Python", "Python2"]: |
642 ["Python", "Python2"]: |
642 args.append("-py2") |
643 args.append("-py2") |
643 else: |
644 else: |
644 args.append("-py3") |
645 args.append("-py3") |
645 elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
646 elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
646 self.rccCompiler = 'pyrcc5' |
647 self.rccCompiler = 'pyrcc5' |
647 if Utilities.isWindowsPlatform(): |
648 if Utilities.isWindowsPlatform(): |
648 self.rccCompiler += '.exe' |
649 self.rccCompiler = \ |
|
650 Utilities.getWindowsExecutablePath(self.rccCompiler) |
649 elif self.project.getProjectType() in ["E6Plugin"]: |
651 elif self.project.getProjectType() in ["E6Plugin"]: |
650 if PYQT_VERSION < 0x050000: |
652 if PYQT_VERSION < 0x050000: |
651 self.rccCompiler = 'pyrcc4' |
653 self.rccCompiler = 'pyrcc4' |
652 if self.project.getProjectLanguage() in \ |
654 if self.project.getProjectLanguage() in \ |
653 ["Python", "Python2"]: |
655 ["Python", "Python2"]: |
655 else: |
657 else: |
656 args.append("-py3") |
658 args.append("-py3") |
657 else: |
659 else: |
658 self.rccCompiler = 'pyrcc5' |
660 self.rccCompiler = 'pyrcc5' |
659 if Utilities.isWindowsPlatform(): |
661 if Utilities.isWindowsPlatform(): |
660 self.rccCompiler += '.exe' |
662 self.rccCompiler = \ |
|
663 Utilities.getWindowsExecutablePath(self.rccCompiler) |
661 elif self.project.getProjectType() in ["PySide", "PySideC"]: |
664 elif self.project.getProjectType() in ["PySide", "PySideC"]: |
662 self.rccCompiler = Utilities.generatePySideToolPath( |
665 self.rccCompiler = Utilities.generatePySideToolPath( |
663 'pyside-rcc') |
666 'pyside-rcc') |
664 if self.project.getProjectLanguage() in \ |
667 if self.project.getProjectLanguage() in \ |
665 ["Python", "Python2"]: |
668 ["Python", "Python2"]: |