eric5.py

branch
5_3_x
changeset 2611
dd77cc80e343
parent 2302
f29e9405c851
child 2668
4c5320acf00d
--- a/eric5.py	Sun Apr 21 13:04:02 2013 +0200
+++ b/eric5.py	Mon Apr 22 20:24:58 2013 +0200
@@ -207,16 +207,13 @@
         splash = SplashScreen()
 
     # modify the executable search path for the PyQt4 installer
-    try:
-        from PyQt4 import pyqtconfig
-        pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"]
+    if Globals.isWindowsPlatform():
+        pyqtDataDir = os.path.join(Globals.getPythonModulesDirectory(), "PyQt4")
         if os.path.exists(os.path.join(pyqtDataDir, "bin")):
             path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"]
         else:
             path = pyqtDataDir + os.pathsep + os.environ["PATH"]
         os.environ["PATH"] = path
-    except (AttributeError, ImportError):
-        pass
     
     pluginFile = None
     noopen = False

eric ide

mercurial