Mercurial Repositories > eric / file diff

--- a/scripts/install.py	Wed Sep 01 18:11:31 2021 +0200
+++ b/scripts/install.py	Wed Sep 01 19:23:27 2021 +0200
@@ -500,17 +500,12 @@
     
     # Remove the wrapper scripts
     rem_wnames = [
-        "eric7_api", "eric7_compare",
-        "eric7_configure", "eric7_diff",
-        "eric7_doc", "eric7_qregularexpression",
-        "eric7_qregexp", "eric7_re",
-        "eric7_trpreviewer", "eric7_uipreviewer",
-        "eric7_unittest", "eric7",
-        "eric7_tray", "eric7_editor",
-        "eric7_plugininstall", "eric7_pluginuninstall",
-        "eric7_pluginrepository", "eric7_sqlbrowser",
-        "eric7_iconeditor", "eric7_snap", "eric7_hexeditor",
-        "eric7_browser", "eric7_shell",
+        "eric7_api", "eric7_browser", "eric7_compare", "eric7_configure",
+        "eric7_diff", "eric7_doc", "eric7_editor", "eric7_hexeditor",
+        "eric7_iconeditor", "eric7_plugininstall", "eric7_pluginrepository",
+        "eric7_pluginuninstall", "eric7_qregularexpression", "eric7_re",
+        "eric7_shell", "eric7_snap", "eric7_sqlbrowser", "eric7_tray",
+        "eric7_trpreviewer", "eric7_uipreviewer", "eric7_unittest", "eric7"
     ]
     
     try:
@@ -703,14 +698,14 @@
     wnames = []
     for name in ["eric7_api", "eric7_doc"]:
         wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir, False))
-    # TODO: add "eric7_browser" once PyQt 6.2.0/Qt 6.2.0 is released
-    for name in ["eric7_compare", "eric7_configure", "eric7_diff",
-                 "eric7_editor", "eric7_hexeditor", "eric7_iconeditor",
-                 "eric7_plugininstall", "eric7_pluginrepository",
-                 "eric7_pluginuninstall", "eric7_qregularexpression",
-                 "eric7_re", "eric7_snap", "eric7_sqlbrowser", "eric7_tray",
-                 "eric7_trpreviewer", "eric7_uipreviewer", "eric7_unittest",
-                 "eric7_shell", "eric7"]:
+    for name in ["eric7_browser", "eric7_compare", "eric7_configure",
+                 "eric7_diff", "eric7_editor", "eric7_hexeditor",
+                 "eric7_iconeditor", "eric7_plugininstall",
+                 "eric7_pluginrepository", "eric7_pluginuninstall",
+                 "eric7_qregularexpression", "eric7_re", "eric7_snap",
+                 "eric7_sqlbrowser", "eric7_tray", "eric7_trpreviewer",
+                 "eric7_uipreviewer", "eric7_unittest", "eric7_shell",
+                 "eric7"]:
         wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir))
     
     # set install prefix, if not None
@@ -793,12 +788,10 @@
             os.path.join(eric7SourceDir, "UI", "data"),
             os.path.join(cfg['ericDir'], "UI", "data"),
             ['*.css'])
-        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-        if False:
-            copyTree(
-                os.path.join(eric7SourceDir, "WebBrowser"),
-                os.path.join(cfg['ericDir'], "WebBrowser"),
-                ['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js'])
+        copyTree(
+            os.path.join(eric7SourceDir, "WebBrowser"),
+            os.path.join(cfg['ericDir'], "WebBrowser"),
+            ['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js'])
         
         # copy the wrappers
         for wname in wnames:
@@ -1500,11 +1493,11 @@
         exit(1)
     print("Found {0}".format(pyuic))
     
-    # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-    if False:
-        try:
-            from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
-        except ImportError as msg:
+    try:
+        from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    except ImportError as msg:
+        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
+        if False:
             if isSudo:
                 print("Optional 'PyQt6-WebEngine' could not be detected.")
             else: