Merged remote changes.

Thu, 28 Jun 2012 19:04:16 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 28 Jun 2012 19:04:16 +0200
changeset 1918
f1bc2b9f4402
parent 1917
c73052b6b65e (current diff)
parent 1914
fa4d57a6c3a9 (diff)
child 1919
86ba302d02b2

Merged remote changes.

--- a/Helpviewer/HelpWindow.py	Sun Jun 24 18:08:36 2012 +0200
+++ b/Helpviewer/HelpWindow.py	Thu Jun 28 19:04:16 2012 +0200
@@ -1532,7 +1532,7 @@
         forwardButton.setPopupMode(QToolButton.MenuButtonPopup)
         
         bookmarksModel = self.bookmarksManager().bookmarksModel()
-        self.bookmarksToolBar = BookmarksToolBar(self, bookmarksModel)
+        self.bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self)
         self.bookmarksToolBar.setObjectName("BookmarksToolBar")
         self.bookmarksToolBar.setIconSize(UI.Config.ToolBarIconSize)
         self.bookmarksToolBar.openUrl.connect(self.openUrl)
--- a/Utilities/__init__.py	Sun Jun 24 18:08:36 2012 +0200
+++ b/Utilities/__init__.py	Thu Jun 28 19:04:16 2012 +0200
@@ -1624,7 +1624,15 @@
     
     @return flag indicating good versions were found (boolean)
     """
-    from install import BlackLists
+    from install import BlackLists, PlatformsBlackLists
+    
+    # determine the platform dependent black list
+    if isWindowsPlatform():
+        PlatformBlackLists = PlatformsBlackLists["windows"]
+    elif isLinuxPlatform():
+        PlatformBlackLists = PlatformsBlackLists["linux"]
+    else:
+        PlatformBlackLists = PlatformsBlackLists["mac"]
     
     # check version of sip
     try:
@@ -1633,7 +1641,7 @@
         # always assume, that snapshots are good
         if "snapshot" not in sipVersion:
             # check for blacklisted versions
-            for vers in BlackLists["sip"]:
+            for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
                 if vers == sipVersion:
                     print('Sorry, sip version {0} is not compatible with eric5.'\
                           .format(vers))
@@ -1648,7 +1656,7 @@
     # always assume, that snapshots are good
     if "snapshot" not in pyqtVersion:
         # check for blacklisted versions
-        for vers in BlackLists["PyQt4"]:
+        for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]:
             if vers == pyqtVersion:
                 print('Sorry, PyQt4 version {0} is not compatible with eric5.'\
                       .format(vers))
@@ -1661,7 +1669,7 @@
     # always assume, that snapshots are new enough
     if "snapshot" not in scintillaVersion:
         # check for blacklisted versions
-        for vers in BlackLists["QScintilla2"]:
+        for vers in BlackLists["QScintilla2"] + PlatformBlackLists["QScintilla2"]:
             if vers == scintillaVersion:
                 print('Sorry, QScintilla2 version {0} is not compatible with eric5.'\
                       .format(vers))
--- a/install.py	Sun Jun 24 18:08:36 2012 +0200
+++ b/install.py	Thu Jun 28 19:04:16 2012 +0200
@@ -40,6 +40,25 @@
     "PyQt4": ["4.7.5"],
     "QScintilla2": [],
 }
+PlatformsBlackLists = {
+    "windows": {
+        "sip": [],
+        "PyQt4": ["4.9.2", "4.9.3"],
+        "QScintilla2": [],
+    },
+    
+    "linux": {
+        "sip": [],
+        "PyQt4": [],
+        "QScintilla2": [],
+    },
+    
+    "mac": {
+        "sip": [],
+        "PyQt4": ["4.9.2", "4.9.3"],
+        "QScintilla2": [],
+    },
+}
 
 
 def exit(rcode=0):
@@ -755,6 +774,14 @@
         exit(1)
     print("Found QScintilla2")
     
+    # determine the platform dependent black list
+    if sys.platform.startswith("win"):
+        PlatformBlackLists = PlatformsBlackLists["windows"]
+    elif sys.platform.startswith("linux"):
+        PlatformBlackLists = PlatformsBlackLists["linux"]
+    else:
+        PlatformBlackLists = PlatformsBlackLists["mac"]
+    
     # check version of Qt
     qtMajor = int(qVersion().split('.')[0])
     qtMinor = int(qVersion().split('.')[1])
@@ -770,7 +797,7 @@
         # always assume, that snapshots are new enough
         if "snapshot" not in sipVersion:
             # check for blacklisted versions
-            for vers in BlackLists["sip"]:
+            for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
                 if vers == sipVersion:
                     print('Sorry, sip version {0} is not compatible with eric5.'\
                           .format(vers))
@@ -795,7 +822,7 @@
                   ' a recent snapshot release.')
             exit(4)
         # check for blacklisted versions
-        for vers in BlackLists["PyQt4"]:
+        for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]:
             if vers == pyqtVersion:
                 print('Sorry, PyQt4 version {0} is not compatible with eric5.'\
                       .format(vers))
@@ -819,7 +846,7 @@
                   ' a recent snapshot release.')
             exit(5)
         # check for blacklisted versions
-        for vers in BlackLists["QScintilla2"]:
+        for vers in BlackLists["QScintilla2"] + PlatformBlackLists["QScintilla2"]:
             if vers == scintillaVersion:
                 print('Sorry, QScintilla2 version {0} is not compatible with eric5.'\
                       .format(vers))

eric ide

mercurial