Fixed an issue in the install script related to the usage of the PyQt4 Windows installer. 5_0_x

Mon, 11 Oct 2010 14:58:13 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 11 Oct 2010 14:58:13 +0200
branch
5_0_x
changeset 672
879ce9fd9deb
parent 667
85d1ac2a4474
child 681
9b86ddc7bb82

Fixed an issue in the install script related to the usage of the PyQt4 Windows installer.

install.py file | annotate | diff | comparison | revisions
--- a/install.py	Sun Oct 10 11:26:37 2010 +0200
+++ b/install.py	Mon Oct 11 14:58:13 2010 +0200
@@ -106,7 +106,12 @@
     
     try:
         from PyQt4 import pyqtconfig
-        qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
+        pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"]
+        if os.path.exists(os.path.join(pyqtDataDir, "qsci")):
+            # it's the installer
+            qtDataDir = pyqtDataDir
+        else:
+            qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
     except (AttributeError, ImportError):
         qtDataDir = None
     if qtDataDir:

eric ide

mercurial