diff -r 0c47cbb5b199 -r 0c5bc18da740 Globals/__init__.py
--- a/Globals/__init__.py Mon Sep 08 20:13:54 2014 +0200
+++ b/Globals/__init__.py Sat Sep 13 16:13:52 2014 +0200
@@ -94,9 +94,10 @@
# always assume, that snapshots are good
if "snapshot" not in pyqtVersion:
# check for blacklisted versions
- for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]:
+ pyqtVariant = "PyQt{0}".format(pyqtVersion[0])
+ for vers in BlackLists[pyqtVariant] + PlatformBlackLists[pyqtVariant]:
if vers == pyqtVersion:
- print('Sorry, PyQt5 version {0} is not compatible with eric6.'
+ print('Sorry, PyQt version {0} is not compatible with eric6.'
.format(vers))
print('Please install another version.')
return False
@@ -160,6 +161,7 @@
return distutils.sysconfig.get_python_lib(True)
+# TODO: modify to also work with PyQt4
def getPyQt5ModulesDirectory():
"""
Function to determine the path to PyQt5's modules directory.
