Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Fri May 24 18:39:58 2013 +0200
+++ b/Preferences/ProgramsDialog.py	Tue May 28 20:52:12 2013 +0200
@@ -85,31 +85,38 @@
         exe = Utilities.isWindowsPlatform() and \
             "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or \
             Utilities.generateQtToolName("lrelease")
+        exe = os.path.join(Utilities.getQtBinariesPath(), exe)
         version = self.__createProgramEntry(self.trUtf8("Translation Converter (Qt)"),
                     exe, '-version', 'lrelease', -1)
         # 1b. Qt Designer
         if Utilities.isWindowsPlatform():
-            exe = "{0}.exe".format(Utilities.generateQtToolName("designer"))
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                "{0}.exe".format(Utilities.generateQtToolName("designer")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("designer")
         else:
-            exe = Utilities.generateQtToolName("designer")
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                Utilities.generateQtToolName("designer"))
         self.__createProgramEntry(self.trUtf8("Qt Designer"), exe, version=version)
         # 1c. Qt Linguist
         if Utilities.isWindowsPlatform():
-            exe = "{0}.exe".format(Utilities.generateQtToolName("linguist"))
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                "{0}.exe".format(Utilities.generateQtToolName("linguist")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("linguist")
         else:
-            exe = Utilities.generateQtToolName("linguist")
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                Utilities.generateQtToolName("linguist"))
         self.__createProgramEntry(self.trUtf8("Qt Linguist"), exe, version=version)
         # 1d. Qt Assistant
         if Utilities.isWindowsPlatform():
-            exe = "{0}.exe".format(Utilities.generateQtToolName("assistant"))
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                "{0}.exe".format(Utilities.generateQtToolName("assistant")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("assistant")
         else:
-            exe = Utilities.generateQtToolName("assistant")
+            exe = os.path.join(Utilities.getQtBinariesPath(),
+                Utilities.generateQtToolName("assistant"))
         self.__createProgramEntry(self.trUtf8("Qt Assistant"), exe, version=version)
         
         # 2. do the PyQt programs