Merged with branch 'eric7' in order to track these changes. server

Wed, 15 May 2024 10:58:12 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 15 May 2024 10:58:12 +0200
branch
server
changeset 10707
3df56b1c9570
parent 10704
27d21e5163b8 (current diff)
parent 10706
8919e74bd4a7 (diff)
child 10708
a6094987c1be

Merged with branch 'eric7' in order to track these changes.

eric7.epj file | annotate | diff | comparison | revisions
src/eric7/Preferences/__init__.py file | annotate | diff | comparison | revisions
--- a/eric7.epj	Wed May 15 10:45:50 2024 +0200
+++ b/eric7.epj	Wed May 15 10:58:12 2024 +0200
@@ -1033,6 +1033,7 @@
         "skip-string-normalization": false,
         "source": "project",
         "target-version": [
+          "py313",
           "py312",
           "py311",
           "py310",
--- a/src/eric7/HelpViewer/HelpViewerWidget.py	Wed May 15 10:45:50 2024 +0200
+++ b/src/eric7/HelpViewer/HelpViewerWidget.py	Wed May 15 10:58:12 2024 +0200
@@ -1280,13 +1280,13 @@
         )
 
         if QtUtilities.qVersionTuple() >= (6, 6, 0):
-            # Qt >= 6.6
+            # Qt 6.6+
             settings.setAttribute(
                 QWebEngineSettings.WebAttribute.ReadingFromCanvasEnabled, False
             )
 
         if QtUtilities.qVersionTuple() >= (6, 7, 0):
-            # Qt >= 6.7
+            # Qt 6.7+
             settings.setAttribute(
                 QWebEngineSettings.WebAttribute.ForceDarkMode,
                 Preferences.getWebBrowser("ForceDarkMode"),
--- a/src/eric7/Preferences/__init__.py	Wed May 15 10:45:50 2024 +0200
+++ b/src/eric7/Preferences/__init__.py	Wed May 15 10:58:12 2024 +0200
@@ -1351,10 +1351,8 @@
 
         if QtUtilities.qVersionTuple() >= (6, 7, 0):
             # Qt 6.7+
-            cls.webBrowserDefaults["ForceDarkMode"] = (
-                webEngineSettings.testAttribute(
-                    QWebEngineSettings.WebAttribute.ForceDarkMode
-                )
+            cls.webBrowserDefaults["ForceDarkMode"] = webEngineSettings.testAttribute(
+                QWebEngineSettings.WebAttribute.ForceDarkMode
             )
 
         cls.webEngineSettingsIntitialized = True

eric ide

mercurial