Mercurial Repositories > eric / changeset

--- a/install.py	Thu Aug 23 17:54:43 2018 +0200
+++ b/install.py	Thu Aug 23 18:11:52 2018 +0200
@@ -1371,7 +1371,10 @@
             "PyQt5.QtSql", "PyQt5.QtSvg", "PyQt5.QtWidgets",
         ]
         altModulesList = [
-            ("PyQt5.QtWebEngineWidgets", "PyQt5.QtWebKitWidgets")
+            # Tuple with alternatives, flag indicating it's ok to not be
+            # available (e.g. for 32-Bit Windows)
+            (("PyQt5.QtWebEngineWidgets", "PyQt5.QtWebKitWidgets"),
+             sys.maxsize <= 2**32),
         ]
     # check mandatory modules
     modulesOK = True
@@ -1389,7 +1392,7 @@
     # check mandatory modules with alternatives
     if altModulesList:
         altModulesOK = True
-        for altModules in altModulesList:
+        for altModules, forcedOk in altModulesList:
             modulesOK = False
             for altModule in altModules:
                 name = altModule.split(".")[1]
@@ -1400,7 +1403,7 @@
                     break
                 except ImportError:
                     pass
-            if not modulesOK:
+            if not modulesOK and not forcedOk:
                 altModulesOK = False
                 print('Sorry, please install {0}.'
                       .format(" or ".join(altModules)))