--- a/Preferences/ProgramsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ProgramsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,9 @@ import os import re -from PyQt4.QtCore import pyqtSlot, Qt, QProcess -from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \ +from PyQt5.QtCore import pyqtSlot, Qt, QProcess +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QApplication, QTreeWidgetItem, QHeaderView, \ QDialog, QDialogButtonBox from E5Gui.E5Application import e5App @@ -132,19 +133,19 @@ self.tr("Qt Assistant"), exe, version=version) # 2. do the PyQt programs - # 2a. Translation Extractor PyQt4 + # 2a. Translation Extractor PyQt5 self.__createProgramEntry( - self.tr("Translation Extractor (Python, PyQt4)"), + self.tr("Translation Extractor (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pylupdate4.exe" or "pylupdate4", '-version', 'pylupdate', -1) - # 2b. Forms Compiler PyQt4 + # 2b. Forms Compiler PyQt5 self.__createProgramEntry( - self.tr("Forms Compiler (Python, PyQt4)"), + self.tr("Forms Compiler (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pyuic4.bat" or "pyuic4", '--version', 'Python User', 4) - # 2c. Resource Compiler PyQt4 + # 2c. Resource Compiler PyQt5 self.__createProgramEntry( - self.tr("Resource Compiler (Python, PyQt4)"), + self.tr("Resource Compiler (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pyrcc4.exe" or "pyrcc4", '-version', 'Resource Compiler', -1) # 2d. Translation Extractor PyQt5