Merge latest changes. 5_0_x

Sat, 18 Sep 2010 18:54:10 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 18 Sep 2010 18:54:10 +0200
branch
5_0_x
changeset 632
9754de0f663a
parent 631
9ca86837a591 (current diff)
parent 621
777ea169520e (diff)
child 636
dfdce6274606

Merge latest changes.

--- a/install.py	Sat Sep 18 18:52:57 2010 +0200
+++ b/install.py	Sat Sep 18 18:54:10 2010 +0200
@@ -846,22 +846,6 @@
     except ImportError:
         pass
     
-    #check version of PyQt
-    from PyQt4.QtCore import PYQT_VERSION_STR
-    pyqtVersion = PYQT_VERSION_STR
-    # always assume, that snapshots are new enough
-    if pyqtVersion.find("snapshot-") == -1:
-        while pyqtVersion.count('.') < 2:
-            pyqtVersion += '.0'
-        (maj, min, pat) = pyqtVersion.split('.')
-        maj = int(maj)
-        min = int(min)
-        pat = int(pat)
-        if min < 5:
-            print()
-            print("You have to patch PyQt QNetworkAccessManager.")
-            print("See the patches directory for details.")
-    
     print()
     exit()
     

eric ide

mercurial