Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Preferences/__init__.py	Wed Apr 24 20:01:41 2013 +0200
@@ -33,8 +33,7 @@
 from E5Network.E5Ftp import E5FtpProxyType
 
 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \
-    isWindowsPlatform, findPython2Interpreters, getPyQt4ModulesDirectory, \
-    getQtBinariesPath
+    isWindowsPlatform, findPython2Interpreters, getPyQt4ModulesDirectory
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
@@ -854,7 +853,6 @@
         "Qt4TranslationsDir": "",
         "QtToolsPrefix4": "",
         "QtToolsPostfix4": "",
-        "Qt4Dir": "",
     }
     
     # defaults for corba related stuff
@@ -2349,11 +2347,6 @@
     """
     if key == "Qt4TranslationsDir":
         return getQt4TranslationsDir(prefClass)
-    elif key == "Qt4Dir":
-        p = prefClass.settings.value("Qt/" + key, prefClass.qtDefaults[key])
-        if p == "":
-            p = getQtBinariesPath()
-        return p
     else:
         return prefClass.settings.value("Qt/" + key, prefClass.qtDefaults[key])