diff -r ebab8ba287e6 -r 6b42677d7043 eric6/Project/ProjectResourcesBrowser.py
--- a/eric6/Project/ProjectResourcesBrowser.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py Mon Sep 02 18:50:38 2019 +0200
@@ -11,7 +11,7 @@
import os
-from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess
+from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
from PyQt5.QtWidgets import QDialog, QApplication, QMenu
from E5Gui.E5Application import e5App
@@ -647,24 +647,15 @@
["Python", "Python2", "Python3"]:
if self.project.getProjectType() in ["Qt4", "Qt4C"]:
self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
- if PYQT_VERSION >= 0x040500:
- if self.project.getProjectLanguage() in \
- ["Python", "Python2"]:
- args.append("-py2")
- else:
- args.append("-py3")
+ if self.project.getProjectLanguage() in \
+ ["Python", "Python2"]:
+ args.append("-py2")
+ else:
+ args.append("-py3")
elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
elif self.project.getProjectType() in ["E6Plugin"]:
- if PYQT_VERSION < 0x050000:
- self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
- if self.project.getProjectLanguage() in \
- ["Python", "Python2"]:
- args.append("-py2")
- else:
- args.append("-py3")
- else:
- self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
+ self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
elif self.project.getProjectType() in ["PySide", "PySideC"]:
self.rccCompiler = Utilities.generatePySideToolPath(
'pyside-rcc', "1")
