Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Tue Apr 23 19:57:07 2013 +0200
+++ b/Preferences/ProgramsDialog.py	Wed Apr 24 18:16:34 2013 +0200
@@ -10,7 +10,7 @@
 import os
 import re
 
-from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QLibraryInfo
+from PyQt4.QtCore import pyqtSlot, Qt, QProcess
 from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \
     QDialog, QDialogButtonBox
 
@@ -79,37 +79,37 @@
         exe = Utilities.isWindowsPlatform() and \
             "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or \
             Utilities.generateQtToolName("lrelease")
-        exe = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath), exe)
+        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 = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            exe = os.path.join(Utilities.getQtBinariesPath(),
                 "{0}.exe".format(Utilities.generateQtToolName("designer")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("designer")
         else:
-            exe = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            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 = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            exe = os.path.join(Utilities.getQtBinariesPath(),
                 "{0}.exe".format(Utilities.generateQtToolName("linguist")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("linguist")
         else:
-            exe = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            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 = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            exe = os.path.join(Utilities.getQtBinariesPath(),
                 "{0}.exe".format(Utilities.generateQtToolName("assistant")))
         elif Utilities.isMacPlatform():
             exe = Utilities.getQtMacBundle("assistant")
         else:
-            exe = os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
+            exe = os.path.join(Utilities.getQtBinariesPath(),
                 Utilities.generateQtToolName("assistant"))
         self.__createProgramEntry(self.trUtf8("Qt Assistant"), exe, version=version)