Merge branch 'qutebrowser:main' into feature_contexthinter

doc/changelog.asciidoc

@@ -28,6 +28,10 @@ Fixed
 
 - The version info now includes the Wayland compositor name if wayland-client is
   available under a different name than `libwayland-client.so` (#8771).
+- The list of Chromium extensions in `--version` / `:version` now uses the
+  correct Chromium data profile, also fixing a crash with Qt 6.10.1 (#8785).
+- With Qt 6.10.1, `qt.workarounds.disable_hangouts_extension` now doesn't apply
+  on private profiles, avoiding a Qt bug leading to a crash (#8785).
 
 [[v3.6.1]]
 v3.6.1 (2025-11-03)

misc/requirements/requirements-dev.txt

@@ -7,13 +7,13 @@ backports.tarfile==1.2.0
 bracex==2.6
 build==1.3.0
 bump-my-version==1.2.4
-certifi==2025.10.5
+certifi==2025.11.12
 cffi==2.0.0
 charset-normalizer==3.4.4
 click==8.1.8
 cryptography==46.0.3
 docutils==0.22.3
-exceptiongroup==1.3.0
+exceptiongroup==1.3.1
 github3.py==4.0.1
 h11==0.16.0
 httpcore==1.0.9
@@ -30,7 +30,7 @@ jaraco.context==6.0.1
 jaraco.functools==4.0.1
 jaraco.text==3.12.1
 jeepney==0.9.0
-keyring==25.6.0
+keyring==25.7.0
 manhole==1.8.1
 markdown-it-py==3.0.0
 mdurl==0.1.2

misc/requirements/requirements-mypy.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 chardet==5.2.0
-diff_cover==9.7.1
+diff_cover==9.7.2
 Jinja2==3.1.6
 lxml==6.0.2
 MarkupSafe==3.0.3
@@ -13,7 +13,7 @@ Pygments==2.19.2
 PyQt5-stubs==5.15.6.0
 tomli==2.3.0
 types-colorama==0.4.15.20250801
-types-docutils==0.22.2.20251006
-types-Pygments==2.19.0.20250809
+types-docutils==0.22.3.20251115
+types-Pygments==2.19.0.20251121
 types-PyYAML==6.0.12.20250915
 typing_extensions==4.15.0

misc/requirements/requirements-pyinstaller.txt

@@ -1,8 +1,8 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-altgraph==0.17.4
+altgraph==0.17.5
 importlib_metadata==8.7.0
 packaging==25.0
 pyinstaller==6.16.0
-pyinstaller-hooks-contrib==2025.9
+pyinstaller-hooks-contrib==2025.10
 zipp==3.23.0

misc/requirements/requirements-pylint.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 astroid==3.3.11
-certifi==2025.10.5
+certifi==2025.11.12
 cffi==2.0.0
 charset-normalizer==3.4.4
 cryptography==46.0.3

misc/requirements/requirements-pyroma.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 build==1.3.0
-certifi==2025.10.5
+certifi==2025.11.12
 charset-normalizer==3.4.4
 check-manifest==0.51
 docutils==0.22.3
@@ -13,6 +13,6 @@ pyproject_hooks==1.2.0
 pyroma==5.0
 requests==2.32.5
 tomli==2.3.0
-trove-classifiers==2025.9.11.17
+trove-classifiers==2025.11.14.15
 urllib3==2.5.0
 zipp==3.23.0

misc/requirements/requirements-sphinx.txt

@@ -2,7 +2,7 @@
 
 alabaster==0.7.16
 babel==2.17.0
-certifi==2025.10.5
+certifi==2025.11.12
 charset-normalizer==3.4.4
 docutils==0.21.2
 idna==3.11

misc/requirements/requirements-tests.txt

@@ -5,13 +5,13 @@ autocommand==2.2.2
 backports.tarfile==1.2.0
 beautifulsoup4==4.14.2
 blinker==1.9.0
-certifi==2025.10.5
+certifi==2025.11.12
 charset-normalizer==3.4.4
 cheroot==11.1.2
 click==8.1.8
 coverage==7.10.7
-exceptiongroup==1.3.0
-execnet==2.1.1
+exceptiongroup==1.3.1
+execnet==2.1.2
 filelock==3.19.1
 Flask==3.1.2
 gherkin-official==29.0.0

misc/requirements/requirements-tox.txt

@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-cachetools==6.2.1
+cachetools==6.2.2
 chardet==5.2.0
 colorama==0.4.6
 distlib==0.4.0

qutebrowser/browser/webengine/webenginesettings.py

@@ -431,6 +431,17 @@ def _maybe_disable_hangouts_extension(profile: QWebEngineProfile) -> None:
         except AttributeError:
             return  # added in QtWebEngine 6.10
 
+        qtwe_versions = version.qtwebengine_versions(avoid_init=True)
+        if (
+            qtwe_versions.webengine == utils.VersionNumber(6, 10, 1)
+            and profile.isOffTheRecord()
+        ):
+            # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/8785
+            log.misc.warning(
+                "Not disabling Hangouts extension on private profile to avoid "
+                "QtWebEngine crash with Qt 6.10.1")
+            return
+
         assert ext_manager is not None  # mypy
         for info in ext_manager.extensions():
             if info.id() == pakjoy.HANGOUTS_EXT_ID:
@@ -458,14 +469,18 @@ def _clear_webengine_permissions_json():
         )
 
 
+def default_qt_profile() -> QWebEngineProfile:
+    """Get the default profile from Qt."""
+    if machinery.IS_QT6:
+        return QWebEngineProfile("Default")
+    else:
+        return QWebEngineProfile.defaultProfile()
+
+
 def _init_default_profile():
     """Init the default QWebEngineProfile."""
     global default_profile
-
-    if machinery.IS_QT6:
-        default_profile = QWebEngineProfile("Default")
-    else:
-        default_profile = QWebEngineProfile.defaultProfile()
+    default_profile = default_qt_profile()
     assert not default_profile.isOffTheRecord()
 
     assert parsed_user_agent is None  # avoid earlier profile initialization

qutebrowser/utils/version.py

@@ -657,6 +657,7 @@ class WebEngineVersions:
 
         ## Qt 6.10
         utils.VersionNumber(6, 10): (_BASES[134], '140.0.7339.207'),  # 2025-09-22
+        utils.VersionNumber(6, 10, 1): (_BASES[134], '142.0.7444.162'),  # 2025-11-11
     }
 
     def __post_init__(self) -> None:
@@ -930,12 +931,18 @@ def _webengine_extensions() -> Sequence[str]:
     lines: list[str] = []
     if (
         objects.backend == usertypes.Backend.QtWebEngine
-        and "avoid-chromium-init" not in objects.debug_flags
         and machinery.IS_QT6  # mypy; TODO early return once Qt 5 is dropped
     ):
-        from qutebrowser.qt.webenginecore import QWebEngineProfile
-        profile = QWebEngineProfile.defaultProfile()
-        assert profile is not None  # mypy
+        from qutebrowser.browser.webengine import webenginesettings
+        lines.append("WebExtensions:")
+
+        if webenginesettings.default_profile:
+            profile = webenginesettings.default_profile
+        elif "avoid-chromium-init" in objects.debug_flags:
+            lines[0] += " unknown (avoiding init)"
+            return lines
+        else:
+            profile = webenginesettings.default_qt_profile()
 
         try:
             ext_manager = profile.extensionManager()
@@ -944,7 +951,6 @@ def _webengine_extensions() -> Sequence[str]:
             return []
         assert ext_manager is not None  # mypy
 
-        lines.append("WebExtensions:")
         if not ext_manager.extensions():
             lines[0] += " none"
 

tests/end2end/data/scroll/simple.html

@@ -15,9 +15,11 @@
                     console.log("[PASS] Positions equal: " + old_position);
                 }
             }
+
+            requestAnimationFrame(() => console.log('simple loaded'))
         </script>
     </head>
-    <body onload="console.log('simple loaded')">
+    <body>
       <a href="/data/hello.txt" id="link">Just a link</a>
       <button>blub</button>
         <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>

tests/end2end/features/sessions.feature

@@ -75,6 +75,7 @@ Feature: Saving and loading sessions
   @qtwebkit_skip
   Scenario: Scrolling (qtwebengine)
     When I open data/scroll/simple.html
+    And I wait for "* simple loaded" in the log
     And I run :scroll-px 10 20
     And I wait until the scroll position changed to 10/20
     Then the session should look like:

tests/end2end/features/test_prompts_bdd.py

@@ -50,13 +50,13 @@ def fresh_instance(quteproc):
     # on PyQt6.8 we disable that with the new API, otherwise restart the
     # browser to make it forget previous prompts.
     #
-    # Qt 6.10 Beta 4 accidentally persists some permissions;
-    # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-140194
+    # Starting with Qt 6.10, QtWebEngine unconditionally persists some permissions;
+    # see https://bugreports.qt.io/browse/QTBUG-140194
     if (
         qtutils.version_check("6.8", compiled=False)
         and PYQT_WEBENGINE_VERSION
         and PYQT_WEBENGINE_VERSION < 0x60800
-    ) or qtutils.version_check("6.10", compiled=False, exact=True):
+    ) or qtutils.version_check("6.10", compiled=False):
         quteproc.terminate()
         quteproc.start()
 

tests/end2end/test_invocations.py

@@ -21,6 +21,7 @@ import pytest
 from qutebrowser.qt.core import QProcess, QPoint
 
 from helpers import testutils
+from end2end.fixtures import quteprocess
 from qutebrowser.utils import qtutils, utils, version
 
 
@@ -251,6 +252,7 @@ def test_optimize(request, quteproc_new, capfd, level):
 def test_version(request):
     """Test invocation with --version argument."""
     args = ['-m', 'qutebrowser', '--version'] + _base_args(request.config)
+    args.remove("--json-logging")
     # can't use quteproc_new here because it's confused by
     # early process termination
     proc = QProcess()
@@ -611,6 +613,26 @@ def test_service_worker_workaround(
         assert not service_worker_dir.exists()
 
 
+@pytest.mark.qt6_only
+def test_disable_hangouts_extension_crash(
+    quteproc_new: quteprocess.QuteProc,
+    request: pytest.FixtureRequest,
+    webengine_versions: version.WebEngineVersions,
+):
+    """Make sure disabling the Hangouts extension doesn't crash."""
+    args = _base_args(request.config) + [
+        '--temp-basedir',
+        '-s', 'qt.workarounds.disable_hangouts_extension', 'true',
+    ]
+    quteproc_new.start(args)
+    if webengine_versions.webengine == utils.VersionNumber(6, 10, 1):
+        line = quteproc_new.wait_for(message="Not disabling Hangouts extension *")
+        line.expected = True
+
+    quteproc_new.send_cmd(':quit')
+    quteproc_new.wait_for_quit()
+
+
 @pytest.mark.parametrize('store', [True, False])
 def test_cookies_store(quteproc_new, request, short_tmpdir, store):
     # Start test process

tests/unit/utils/test_version.py

@@ -1449,11 +1449,9 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
         monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False)
         if machinery.IS_QT6:
             monkeypatch.setattr(
-                QWebEngineProfile,
-                "defaultProfile",
-                lambda: FakeExtensionProfile(
-                    FakeExtensionManager([FakeExtensionInfo("ext1")])
-                ),
+                webenginesettings,
+                "default_profile",
+                FakeExtensionProfile(FakeExtensionManager([FakeExtensionInfo("ext1")])),
             )
             substitutions['webextensions'] = (
                 "\n"
@@ -1592,20 +1590,35 @@ class TestOpenGLInfo:
 class TestWebEngineExtensions:
 
     def test_qtwebkit(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        assert webenginesettings.default_profile is None  # -> default_qt_profile() used
         monkeypatch.setattr(version.objects, "backend", usertypes.Backend.QtWebKit)
-        monkeypatch.setattr(QWebEngineProfile, "defaultProfile", lambda: 1/0)
+        monkeypatch.setattr(webenginesettings, "default_qt_profile", lambda: 1 / 0)
         assert not version._webengine_extensions()
 
     def test_avoid_chromium_init(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        assert webenginesettings.default_profile is None  # -> default_qt_profile() used
         monkeypatch.setattr(version.objects, "backend", usertypes.Backend.QtWebEngine)
         monkeypatch.setattr(objects, "debug_flags", {"avoid-chromium-init"})
-        monkeypatch.setattr(QWebEngineProfile, "defaultProfile", lambda: 1/0)
-        assert not version._webengine_extensions()
+        monkeypatch.setattr(webenginesettings, "default_qt_profile", lambda: 1 / 0)
+        assert version._webengine_extensions() == [
+            "WebExtensions: unknown (avoiding init)"
+        ]
 
     def test_no_extension_manager(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(QWebEngineProfile, "defaultProfile", object)
+        assert webenginesettings.default_profile is None  # -> default_qt_profile() used
+        monkeypatch.setattr(webenginesettings, "default_qt_profile", object)
         assert not version._webengine_extensions()
 
+    @pytest.mark.parametrize("avoid_init", [True, False])
+    def test_preexisting_profile(self, monkeypatch: pytest.MonkeyPatch, avoid_init: bool) -> None:
+        """Test that we use the pre-existing profile if available."""
+        monkeypatch.setattr(webenginesettings, "default_profile", FakeExtensionProfile(FakeExtensionManager([])))
+        if avoid_init:
+            monkeypatch.setattr(objects, "debug_flags", {"avoid-chromium-init"})
+
+        result = version._webengine_extensions()
+        assert result == ["WebExtensions: none"]
+
     @pytest.mark.parametrize(
         "extensions, expected",
         [
@@ -1666,11 +1679,9 @@ class TestWebEngineExtensions:
         expected: list[str],
     ) -> None:
         monkeypatch.setattr(
-            QWebEngineProfile,
-            "defaultProfile",
-            lambda: FakeExtensionProfile(
-                FakeExtensionManager(extensions)
-            ),
+            webenginesettings,
+            "default_profile",
+            FakeExtensionProfile(FakeExtensionManager(extensions)),
         )
         assert version._webengine_extensions() == expected