diff -r ebab8ba287e6 -r 6b42677d7043 eric6/Project/ProjectFormsBrowser.py
--- a/eric6/Project/ProjectFormsBrowser.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py Mon Sep 02 18:50:38 2019 +0200
@@ -13,7 +13,7 @@
import sys
import shutil
-from PyQt5.QtCore import PYQT_VERSION, QThread, QFileInfo, pyqtSignal, QProcess
+from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu
from E5Gui.E5Application import e5App
@@ -675,12 +675,8 @@
self.__uicompiler = Utilities.generatePyQtToolPath(
'pyuic5', ["py3uic5"])
elif self.project.getProjectType() in ["E6Plugin"]:
- if PYQT_VERSION < 0x050000:
- self.__uicompiler = Utilities.generatePyQtToolPath(
- 'pyuic4', ["py3uic4"])
- else:
- self.__uicompiler = Utilities.generatePyQtToolPath(
- 'pyuic5', ["py3uic5"])
+ self.__uicompiler = Utilities.generatePyQtToolPath(
+ 'pyuic5', ["py3uic5"])
elif self.project.getProjectType() == "PySide":
self.__uicompiler = \
Utilities.generatePySideToolPath('pyside-uic', "1")
@@ -837,9 +833,7 @@
else:
# PyQt4 and PyQt5
if 'uic5' in uicompiler and \
- PYQT_VERSION >= 0x050600 and \
self.project.pdata["UICPARAMS"]["Package"]:
- # only supported for PyQt5 >= 5.6 (April 2016)
args.append("--import-from={0}".format(
self.project.pdata["UICPARAMS"]["Package"]))
elif Preferences.getQt("PyuicFromImports"):
