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

Mon, 11 Oct 2010 14:57:26 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 11 Oct 2010 14:57:26 +0200
changeset 671
cc0471f53e74
parent 670
bb833c4bcf28
child 673
1c1f3a125e68

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	Mon Oct 11 11:05:38 2010 +0200
+++ b/install.py	Mon Oct 11 14:57:26 2010 +0200
@@ -109,7 +109,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