Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Mon Dec 31 11:59:44 2012 +0100
+++ b/Preferences/ProgramsDialog.py	Mon Dec 31 12:35:13 2012 +0100
@@ -74,49 +74,49 @@
         header.setSortIndicator(0, Qt.AscendingOrder)
         header.setSortIndicatorShown(False)
         
-        # 1. do the Qt4 programs
+        # 1. do the Qt4/Qt5 programs
         # 1a. Translation Converter
         exe = Utilities.isWindowsPlatform() and \
             "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or \
             Utilities.generateQtToolName("lrelease")
-        version = self.__createProgramEntry(self.trUtf8("Translation Converter (Qt4)"),
+        version = self.__createProgramEntry(self.trUtf8("Translation Converter (Qt)"),
                     exe, '-version', 'lrelease', -1)
-        # 1b. Qt4 Designer
+        # 1b. Qt Designer
         if Utilities.isWindowsPlatform():
             exe = "{0}.exe".format(Utilities.generateQtToolName("designer"))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("designer")
         else:
             exe = Utilities.generateQtToolName("designer")
-        self.__createProgramEntry(self.trUtf8("Qt4 Designer"), exe, version=version)
-        # 1c. Qt4 Linguist
+        self.__createProgramEntry(self.trUtf8("Qt Designer"), exe, version=version)
+        # 1c. Qt Linguist
         if Utilities.isWindowsPlatform():
             exe = "{0}.exe".format(Utilities.generateQtToolName("linguist"))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("linguist")
         else:
             exe = Utilities.generateQtToolName("linguist")
-        self.__createProgramEntry(self.trUtf8("Qt4 Linguist"), exe, version=version)
-        # 1d. Qt4 Assistant
+        self.__createProgramEntry(self.trUtf8("Qt Linguist"), exe, version=version)
+        # 1d. Qt Assistant
         if Utilities.isWindowsPlatform():
             exe = "{0}.exe".format(Utilities.generateQtToolName("assistant"))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("assistant")
         else:
             exe = Utilities.generateQtToolName("assistant")
-        self.__createProgramEntry(self.trUtf8("Qt4 Assistant"), exe, version=version)
+        self.__createProgramEntry(self.trUtf8("Qt Assistant"), exe, version=version)
         
         # 2. do the PyQt programs
         # 2a. Translation Extractor PyQt4
-        self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, Qt4)"),
+        self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, Qt)"),
             Utilities.isWindowsPlatform() and "pylupdate4.exe" or "pylupdate4",
             '-version', 'pylupdate', -1)
         # 2b. Forms Compiler PyQt4
-        self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, Qt4)"),
+        self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, Qt)"),
             Utilities.isWindowsPlatform() and "pyuic4.bat" or "pyuic4",
             '--version', 'Python User', 4)
         # 2c. Resource Compiler PyQt4
-        self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, Qt4)"),
+        self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, Qt)"),
             Utilities.isWindowsPlatform() and "pyrcc4.exe" or "pyrcc4",
             '-version', 'Resource Compiler', -1)