9 |
9 |
10 from __future__ import unicode_literals |
10 from __future__ import unicode_literals |
11 |
11 |
12 import os |
12 import os |
13 |
13 |
14 from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess |
14 from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess |
15 from PyQt5.QtWidgets import QDialog, QApplication, QMenu |
15 from PyQt5.QtWidgets import QDialog, QApplication, QMenu |
16 |
16 |
17 from E5Gui.E5Application import e5App |
17 from E5Gui.E5Application import e5App |
18 from E5Gui import E5MessageBox, E5FileDialog |
18 from E5Gui import E5MessageBox, E5FileDialog |
19 from E5Gui.E5ProgressDialog import E5ProgressDialog |
19 from E5Gui.E5ProgressDialog import E5ProgressDialog |
645 |
645 |
646 if self.project.getProjectLanguage() in \ |
646 if self.project.getProjectLanguage() in \ |
647 ["Python", "Python2", "Python3"]: |
647 ["Python", "Python2", "Python3"]: |
648 if self.project.getProjectType() in ["Qt4", "Qt4C"]: |
648 if self.project.getProjectType() in ["Qt4", "Qt4C"]: |
649 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') |
649 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') |
650 if PYQT_VERSION >= 0x040500: |
650 if self.project.getProjectLanguage() in \ |
651 if self.project.getProjectLanguage() in \ |
651 ["Python", "Python2"]: |
652 ["Python", "Python2"]: |
652 args.append("-py2") |
653 args.append("-py2") |
653 else: |
654 else: |
654 args.append("-py3") |
655 args.append("-py3") |
|
656 elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
655 elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
657 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') |
656 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') |
658 elif self.project.getProjectType() in ["E6Plugin"]: |
657 elif self.project.getProjectType() in ["E6Plugin"]: |
659 if PYQT_VERSION < 0x050000: |
658 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') |
660 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') |
|
661 if self.project.getProjectLanguage() in \ |
|
662 ["Python", "Python2"]: |
|
663 args.append("-py2") |
|
664 else: |
|
665 args.append("-py3") |
|
666 else: |
|
667 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') |
|
668 elif self.project.getProjectType() in ["PySide", "PySideC"]: |
659 elif self.project.getProjectType() in ["PySide", "PySideC"]: |
669 self.rccCompiler = Utilities.generatePySideToolPath( |
660 self.rccCompiler = Utilities.generatePySideToolPath( |
670 'pyside-rcc', "1") |
661 'pyside-rcc', "1") |
671 if self.project.getProjectLanguage() in \ |
662 if self.project.getProjectLanguage() in \ |
672 ["Python", "Python2"]: |
663 ["Python", "Python2"]: |