Release v3.5.1

(cherry picked from commit 1217f7fa45)

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "3.6.3"
+current_version = "3.5.1"
 commit = true
 message = "Release v{new_version}"
 tag = true

.coveragerc

@@ -4,7 +4,6 @@ include =
     tests/*
     scripts/*
 branch = true
-patch = subprocess
 omit =
     qutebrowser/__main__.py
     */__init__.py

.flake8

@@ -42,7 +42,6 @@ exclude = .*,__pycache__,resources.py
 # W503: like break before binary operator
 # W504: line break after binary operator
 # FI18: __future__ import "annotations" missing
-# FI58: __future__ import "annotations" present
 # PT004: fixture '{name}' does not return anything, add leading underscore
 # PT011: pytest.raises(ValueError) is too broad, set the match parameter or use a more specific exception
 # PT012: pytest.raises() block should contain a single simple statement
@@ -55,7 +54,7 @@ ignore =
     D102,D103,D106,D107,D104,D105,D209,D211,D401,D402,D403,D412,D413,
     A003,
     W503, W504,
-    FI18,FI58,
+    FI18,
     PT004,
     PT011,
     PT012

.github/workflows/bleeding.yml

@@ -17,6 +17,8 @@ jobs:
       matrix:
         include:
           - testenv: bleeding
+            image: "archlinux-webengine-unstable-qt6"
+          - testenv: bleeding-qt5
             image: "archlinux-webengine-unstable"
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"
@@ -31,13 +33,14 @@ jobs:
         - /home/runner/work/_temp/:/home/runner/work/_temp/
       options: --privileged --tty
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up problem matchers
         run: "python scripts/dev/ci/problemmatchers.py py3 ${{ runner.temp }}"
       - name: Upgrade 3rd party assets
         run: "tox exec -e ${{ matrix.testenv }} -- python scripts/dev/update_3rdparty.py --gh-token ${{ secrets.GITHUB_TOKEN }} --modern-pdfjs"
+        if: "endsWith(matrix.image, '-qt6')"
       - name: Run tox
         run: dbus-run-session tox -e ${{ matrix.testenv }}
       - name: Gather info
@@ -48,7 +51,7 @@ jobs:
         shell: bash
         if: failure()
       - name: Upload screenshots
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: "end2end-screenshots-${{ steps.info.outputs.date }}-${{ steps.info.outputs.sha_short }}-${{ matrix.image }}"
           path: |

.github/workflows/ci.yml

@@ -27,6 +27,7 @@ jobs:
           - testenv: vulture
           - testenv: misc
           - testenv: pyroma
+          - testenv: check-manifest
           - testenv: eslint
           - testenv: shellcheck
             args: "-f gcc"  # For problem matchers
@@ -34,20 +35,20 @@ jobs:
           - testenv: actionlint
           - testenv: package
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
         with:
           path: |
             .mypy_cache
             .tox
             ~/.cache/pip
           key: "${{ matrix.testenv }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('scripts/dev/pylint_checkers/qute_pylint/*.py') }}"
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
         if: "matrix.testenv == 'eslint'"
@@ -90,10 +91,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webengine
-          - testenv: py
+          - testenv: py-qt5
             image: archlinux-webengine-unstable
+          - testenv: py
+            image: archlinux-webengine-qt6
+          - testenv: py
+            image: archlinux-webengine-unstable-qt6
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"
       env:
@@ -106,7 +111,7 @@ jobs:
         - /home/runner/work/_temp/:/home/runner/work/_temp/
       options: --privileged --tty
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up problem matchers
@@ -121,7 +126,7 @@ jobs:
         shell: bash
         if: failure()
       - name: Upload screenshots
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: "end2end-screenshots-${{ steps.info.outputs.date }}-${{ steps.info.outputs.sha_short }}-${{ matrix.image }}"
           path: |
@@ -186,41 +191,37 @@ jobs:
           - testenv: py313-pyqt68
             os: ubuntu-24.04
             python: "3.13"
-          ### PyQt 6.8 (Python 3.13)
-          - testenv: py313-pyqt68
+          ### PyQt 6.8 (Python 3.14)
+          - testenv: py314-pyqt68
+            os: ubuntu-24.04
+            python: "3.14-dev"
+          ### PyQt 6.9 (Python 3.13)
+          - testenv: py313-pyqt69
             os: ubuntu-24.04
             python: "3.13"
-          ### PyQt 6.9 (Python 3.14)
-          - testenv: py314-pyqt69
-            os: ubuntu-24.04
-            python: "3.14"
-          ### PyQt 6.10 (Python 3.14)
-          - testenv: py314-pyqt610
-            os: ubuntu-24.04
-            python: "3.14"
-          ### macOS Sonoma (M1 runner)
-          - testenv: py314-pyqt610
-            os: macos-14
-            python: "3.14"
+          ### macOS Ventura
+          - testenv: py313-pyqt69
+            os: macos-13
+            python: "3.13"
             args: "tests/unit"  # Only run unit tests on macOS
-          ### macOS Sequoia (Intel runner)
-          - testenv: py314-pyqt610
-            os: macos-15-intel
-            python: "3.14"
+          ### macOS Sonoma (M1 runner)
+          - testenv: py313-pyqt69
+            os: macos-14
+            python: "3.13"
             args: "tests/unit"  # Only run unit tests on macOS
           ### Windows
-          - testenv: py314-pyqt610
+          - testenv: py313-pyqt69
             os: windows-2022
-            python: "3.14"
-          - testenv: py314-pyqt610
+            python: "3.13"
+          - testenv: py313-pyqt69
             os: windows-2025
-            python: "3.14"
+            python: "3.13"
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
         with:
           path: |
             .mypy_cache
@@ -228,7 +229,7 @@ jobs:
             ~/.cache/pip
           key: "${{ matrix.testenv }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}"
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python }}"
       - name: Set up problem matchers
@@ -269,7 +270,7 @@ jobs:
         shell: bash
         if: failure()
       - name: Upload screenshots
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: "end2end-screenshots-${{ steps.info.outputs.date }}-${{ steps.info.outputs.sha_short }}-${{ matrix.testenv }}-${{ matrix.os }}"
           path: |
@@ -285,16 +286,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v3
         with:
           languages: javascript, python
           queries: +security-extended
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v3
 
   irc:
     timeout-minutes: 2

.github/workflows/docker.yml

@@ -15,9 +15,11 @@ jobs:
         image:
           - archlinux-webengine
           - archlinux-webengine-unstable
+          - archlinux-webengine-unstable-qt6
+          - archlinux-webengine-qt6
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - run: pip install jinja2

.github/workflows/nightly.yml

@@ -14,45 +14,36 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-15-intel
+          - os: macos-13
             toxenv: build-release
             name: macos-intel
           - os: macos-14
             toxenv: build-release
             name: macos-apple-silicon
-          - os: windows-latest
+          - os: windows-2019
             toxenv: build-release
             name: windows
-          - os: macos-15-intel
+          - os: macos-13
             args: --debug
             toxenv: build-release
             name: macos-debug-intel
           - os: macos-14
             toxenv: build-release
             name: macos-debug-apple-silicon
-          - os: windows-latest
+          - os: windows-2019
             args: --debug
             toxenv: build-release
             name: windows-debug
     runs-on: "${{ matrix.os }}"
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
-      - name: Install nsis
-        if: "matrix.os == 'windows-latest'"
-        run: |
-          irm get.scoop.sh | iex
-          scoop update
-          scoop bucket add extras
-          scoop install nsis
-          Add-Content $env:GITHUB_PATH "C:\Users\runneradmin\scoop\shims"
-        shell: pwsh
       - name: Install dependencies
         run: |
             python -m pip install -U pip
@@ -72,7 +63,7 @@ jobs:
             echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
         shell: bash
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: "qutebrowser-nightly-${{ steps.info.outputs.date }}-${{ steps.info.outputs.sha_short }}-${{ matrix.name }}"
           path: |

.github/workflows/recompile-requirements.yml

@@ -18,11 +18,11 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up Python 3.9
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'
       - name: Recompile requirements
@@ -41,7 +41,7 @@ jobs:
       - name: Run qutebrowser smoke test
         run: "xvfb-run .venv/bin/python3 -m qutebrowser --no-err-windows --nowindow --temp-basedir about:blank ':later 500 quit'"
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           committer: qutebrowser bot <bot@qutebrowser.org>
           author: qutebrowser bot <bot@qutebrowser.org>

.github/workflows/release.yml

@@ -12,12 +12,11 @@ on:
           - 'patch'
           - 'minor'
           - 'major'
-          - 'reupload'  # reupload last release
           # FIXME do we want a possibility to do prereleases here?
       python_version:
         description: 'Python version'
         required: true
-        default: '3.14'
+        default: '3.13'
         type: choice
         options:
           - '3.9'
@@ -25,20 +24,18 @@ on:
           - '3.11'
           - '3.12'
           - '3.13'
-          - '3.14'
 jobs:
   prepare:
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     outputs:
       version: ${{ steps.bump.outputs.version }}
-      version_x: ${{ steps.bump.outputs.version_x }}
-      release_id: ${{ inputs.release_type == 'reupload' && steps.find-release.outputs.result || steps.create-release.outputs.id }}
+      release_id: ${{ steps.create-release.outputs.id }}
     permissions:
       contents: write  # To push release commit/tag
     steps:
       - name: Find release branch
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         id: find-branch
         with:
           script: |
@@ -62,9 +59,9 @@ jobs:
             console.log(`sorted: ${sorted}`);
             return sorted.at(-1);
           result-encoding: string
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           # Doesn't really matter what we prepare the release with, but let's
           # use the same version for consistency.
@@ -78,7 +75,7 @@ jobs:
             git config --global user.name "qutebrowser bot"
             git config --global user.email "bot@qutebrowser.org"
       - name: Switch to release branch
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.find-branch.outputs.result }}
       - name: Import GPG Key
@@ -86,9 +83,9 @@ jobs:
           gpg --import <<< "${{ secrets.QUTEBROWSER_BOT_GPGKEY }}"
       - name: Bump version
         id: bump
-        run: "tox -e update-version -- ${{ inputs.release_type }}"
+        run: "tox -e update-version -- ${{ github.event.inputs.release_type }}"
       - name: Check milestone
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             const milestones = await github.paginate(github.rest.issues.listMilestones, {
@@ -103,60 +100,35 @@ jobs:
               core.setFailed(`Found open milestone ${milestone.title} with ${milestone.open_issues} open and ${milestone.closed_issues} closed issues!`);
             }
       - name: Push release commit/tag
-        if: ${{ inputs.release_type != 'reupload' }}
         run: |
             git push origin ${{ steps.find-branch.outputs.result }}
             git push origin v${{ steps.bump.outputs.version }}
       - name: Cherry-pick release commit
-        if: ${{ inputs.release_type == 'patch' }}
+        if: ${{ github.event.inputs.release_type == 'patch' }}
         run: |
-            git fetch origin main
             git checkout main
             git cherry-pick -x v${{ steps.bump.outputs.version }}
             git push origin main
             git checkout v${{ steps.bump.outputs.version_x }}
       - name: Create release branch
-        if: ${{ inputs.release_type == 'minor' || inputs.release_type == 'major' }}
+        if: ${{ github.event.inputs.release_type != 'patch' }}
         run: |
             git checkout -b v${{ steps.bump.outputs.version_x }}
             git push --set-upstream origin v${{ steps.bump.outputs.version_x }}
       - name: Create GitHub draft release
-        if: ${{ inputs.release_type != 'reupload' }}
         id: create-release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ steps.bump.outputs.version }}
           draft: true
           body: "*Release artifacts for this release are currently being uploaded...*"
-      - name: Find GitHub draft release
-        if: ${{ inputs.release_type == 'reupload' }}
-        id: find-release
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const releases = await github.paginate(github.rest.repos.listReleases, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            });
-            const names = releases.map(release => release.name);
-            console.log(`releases: ${names}`);
-
-            const release = releases.find(release => release.tag_name === "v${{ steps.bump.outputs.version }}");
-            if (release === undefined) {
-              core.setFailed(`No release found with tag v${{ steps.bump.outputs.version }}!`);
-            }
-            if (!release.draft) {
-              core.setFailed(`Release ${release.tag_name} is not a draft release!`);
-            }
-            return release.id;
-          result-encoding: string
   release:
     strategy:
       matrix:
         include:
-          - os: macos-14-large  # Intel
-          - os: macos-14  # Apple Silicon
-          - os: windows-2022
+          - os: macos-13
+          - os: macos-14
+          - os: windows-2019
           - os: ubuntu-24.04
     runs-on: "${{ matrix.os }}"
     timeout-minutes: 45
@@ -164,13 +136,13 @@ jobs:
     permissions:
       contents: write  # To upload release artifacts
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
-          ref: v${{ inputs.release_type == 'reupload' && needs.prepare.outputs.version_x || needs.prepare.outputs.version }}
+          ref: v${{ needs.prepare.outputs.version }}
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
-          python-version: ${{ inputs.python_version }}
+          python-version: ${{ github.event.inputs.python_version }}
       - name: Import GPG Key
         if: ${{ startsWith(matrix.os, 'ubuntu-') }}
         run: |
@@ -195,7 +167,7 @@ jobs:
       # FIXME consider switching to trusted publishers:
       # https://blog.pypi.org/posts/2023-04-20-introducing-trusted-publishers/
       - name: Build and upload release
-        run: "tox -e build-release -- --upload --no-confirm ${{ inputs.release_type == 'reupload' && '--reupload' || '' }}"
+        run: "tox -e build-release -- --upload --no-confirm"
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.QUTEBROWSER_BOT_PYPI_TOKEN }}
@@ -208,7 +180,7 @@ jobs:
       contents: write  # To change release
     steps:
       - name: Publish final release
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             await github.rest.repos.updateRelease({

doc/changelog.asciidoc

@@ -15,122 +15,6 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
-[[v3.6.4]]
-v3.6.4 (unreleased)
--------------------
-
-Fixed
-~~~~~
-
-- datalist dropdowns not opening correctly on Wayland/Sway (#8831).
-  This was caused by an old workaround for a different QtWebEngine issue,
-  which is now disabled for QtWebEngine 6.6.3 and newer.
-
-[[v3.6.3]]
-v3.6.3 (2025-11-30)
--------------------
-
-Fixed
-~~~~~
-
-- New `qt.workarounds.disable_accessibility` setting, which disables Chromium
-  accessibility support. By default, is it set to `auto`, which only disables
-  accessibility on Qt versions with known issues. This works around a bug in Qt
-  6.10.1 causing frequent segfaults (#8797).
-
-[[v3.6.2]]
-v3.6.2 (2025-11-27)
--------------------
-
-Changed
-~~~~~~~
-
-* Windows and macOS releases now ship with Qt 6.10.1, which include
-  security patches up to Chromium 142.0.7444.162.
-
-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)
--------------------
-
-Fixed
-~~~~~
-
-- A regression in v3.6.0 where the page didn't have keyboard focus after closing
-  the completion, so e.g. typing in an input field after hinting didn't work.
-  (#8750)
-
-[[v3.6.0]]
-v3.6.0 (2025-10-24)
--------------------
-
-Added
-~~~~~
-
-- The `:version` info now shows additional information:
-    * The X11 window manager / Wayland compositor name (mostly useful for
-      bug/crash reports).
-    * Loaded WebExtensions (partial support landed in QtWebEngine 6.10, no
-      official qutebrowser support yet).
-- Support for hinting elements which are part of an (open) shadow DOM.
-
-Changed
-~~~~~~~
-
-- The `qutedmenu` userscript now sorts history by the last access time.
-- Hardware accelerated 2D canvas is now enabled by default on Qt 6.8.2+,
-  as graphic glitches with e.g. PDF.js and Google Sheets should be fixed
-  nowadays. If you still run into issues, please report them and set
-  `qt.workarounds.disable_accelerated_2d_canvas` to `always` to disable it
-  again.
-- Changes to binary releases:
-    * Windows and macOS releases are now built with Qt 6.10.0, which is based
-      on Chromium 134.0.6998.208 with security patches up to 140.0.7339.207.
-    * Windows and macOS releases are now built with Python 3.14.
-    * Windows releases are now built on Windows Server 2022 (previously 2019),
-      which might break compatibility with older Windows releases (untested).
-    * If using `mkvenv.py` on Linux, note that Qt now requires glibc v2.34 (v2.28
-      previously). This is available down to Ubuntu 22.04 LTS and Debian Bookworm
-      (oldstable), so this should not affect most users of desktop distributions.
-
-Fixed
-~~~~~
-
-- Fixed crash if two new downloads start while a download prompt is already open
-  (#8674).
-- Fixed exception when closing a qutebrowser window while a download prompt is
-  still open.
-- Hopefully proper fix for some web pages jumping to the top when the statusbar
-  is hidden (#8223).
-- Fix for the page header being shown on YouTube after the fullscreen
-  notification was hidden (#8625).
-- Fix for videos losing keyboard focus when the fullscreen notification shows
-  (#8174).
-- The workaround for microphone/camera permissions not being requested with
-  QtWebEngine 6.9 on Google Meet, Zoom, or other pages using the new
-  `<permission>` element now got extended to Qt 6.9.1+ as it's still not fixed
-  upstream. (#8612)
-- The package version for Jinja 3.3+ is now correctly displayed in `:version`.
-- Fixed crash with Qt 6.10 (and possibly older Qt versions) when navigating
-  from a `qute://` page to a web page, e.g. when searching on `qute://start`.
-- On Wayland with Qt <= 6.9, `EGL_PLATFORM=wayland` is now set by qutebrowser to
-  get hardware rendering. Qt 6.10 includes an equivalent fix (#8637).
-- Added workaround for per-domain User-Agent header not being used on redirects
-  (#8679).
-- Added site-specific quirk for gitlab.gnome.org agressively blocking old
-  Chromium versions (and thus QtWebEngine) (#8509).
-- Using `:config-list-remove` with an invalid value for the respective option
-  type now corrently displays an error instead of crashing.
-
 [[v3.5.1]]
 v3.5.1 (2025-06-05)
 -------------------

doc/contributing.asciidoc

@@ -121,6 +121,8 @@ Currently, the following tox environments are available:
 * `pyroma`: Check packaging practices with
   https://pypi.python.org/pypi/pyroma/[pyroma].
 * `eslint`: Run https://eslint.org/[ESLint] javascript checker.
+* `check-manifest`: Check MANIFEST.in completeness with
+  https://github.com/mgedmin/check-manifest[check-manifest].
 * `mkvenv`: Bootstrap a virtualenv for testing.
 * `misc`: Run `scripts/misc_checks.py` to check for:
     - untracked git files
@@ -602,7 +604,6 @@ Info pages:
 - chrome://device-log/ (QtWebEngine >= 6.3)
 - chrome://gpu/
 - chrome://sandbox/ (Linux only)
-- chrome://qt/ (QtWebEngine >= 6.7)
 
 Misc. / Debugging pages:
 
@@ -613,7 +614,6 @@ Misc. / Debugging pages:
 - chrome://ukm/ (QtWebEngine >= 5.15.3)
 - chrome://user-actions/ (QtWebEngine >= 5.15.3)
 - chrome://webrtc-logs/ (QtWebEngine >= 5.15.3)
-- chrome://extensions/ (QtWebEngine >= 6.10)
 
 Internals pages:
 
@@ -804,8 +804,7 @@ qutebrowser release
 **Automatic release via GitHub Actions (starting with v3.0.0):**
 
 * Double check Python version in `.github/workflows/release.yml`
-* Run the `release` workflow on the `main` branch, e.g. via `gh workflow run release -f release_type=minor` (`release_type` can be `major`, `minor` or `patch`; you can also override `python_version`)
-* Consider running `gh run watch` or `gh run view --web` to watch the progress
+* Run the `release` workflow on the `main` branch, e.g. via `gh workflow run release -f release_type=major` (`release_type` can be `major`, `minor` or `patch`; you can also override `python_version`)
 
 **Manual release:**
 

doc/faq.asciidoc

@@ -61,7 +61,7 @@ Why Python?::
     point, I wasn't comfortable with C++ so that wasn't an alternative.
 
 But isn't Python too slow for a browser?::
-    https://www.infoworld.com/article/2303031/van-rossum-python-is-not-too-slow-2.html[It's generally less of a problem than one would expect.]
+    https://www.infoworld.com/d/application-development/van-rossum-python-not-too-slow-188715[It's generally less of a problem than one would expect.]
     Most of the heavy lifting of qutebrowser is done by Qt and
     QtWebKit/QtWebEngine in C++, with the
     https://wiki.python.org/moin/GlobalInterpreterLock[GIL] released.
@@ -141,7 +141,7 @@ The comma prefix is used to make sure user-defined bindings don't conflict with
 the built-in ones.
 +
 Note that you might need an additional package (e.g.
-https://archlinux.org/packages/extra/any/yt-dlp/[yt-dlp] on
+https://www.archlinux.org/packages/community/any/youtube-dl/[youtube-dl] on
 Archlinux) to play web videos with mpv.
 +
 There is a very useful script for mpv, which emulates "unique application"

doc/help/configuring.asciidoc

@@ -179,7 +179,7 @@ customizable for a given <<patterns,URL patterns>>.
 
 [source,python]
 ----
-config.set('content.images', False, '*://example.com/*')
+config.set('content.images', False, '*://example.com/')
 ----
 
 Alternatively, you can use `with config.pattern(...) as p:` to get a shortcut
@@ -187,7 +187,7 @@ similar to `c.` which is scoped to the given domain:
 
 [source,python]
 ----
-with config.pattern('*://example.com/*') as p:
+with config.pattern('*://example.com/') as p:
     p.content.images = False
 ----
 

doc/help/settings.asciidoc

@@ -302,7 +302,6 @@
 |<<qt.force_software_rendering,qt.force_software_rendering>>|Force software rendering for QtWebEngine.
 |<<qt.highdpi,qt.highdpi>>|Turn on Qt HighDPI scaling.
 |<<qt.workarounds.disable_accelerated_2d_canvas,qt.workarounds.disable_accelerated_2d_canvas>>|Disable accelerated 2d canvas to avoid graphical glitches.
-|<<qt.workarounds.disable_accessibility,qt.workarounds.disable_accessibility>>|Disable accessibility to avoid crashes on Qt 6.10.1.
 |<<qt.workarounds.disable_hangouts_extension,qt.workarounds.disable_hangouts_extension>>|Disable the Hangouts extension.
 |<<qt.workarounds.locale,qt.workarounds.locale>>|Work around locale parsing issues in QtWebEngine 5.15.3.
 |<<qt.workarounds.remove_service_workers,qt.workarounds.remove_service_workers>>|Delete the QtWebEngine Service Worker directory on every start.
@@ -2771,7 +2770,6 @@ Valid values:
 
  * +ua-google+
  * +ua-googledocs+
- * +ua-gnome-gitlab+
  * +js-whatsapp-web+
  * +js-discord+
  * +js-string-replaceall+
@@ -3992,29 +3990,11 @@ Type: <<types,String>>
 Valid values:
 
  * +always+: Disable accelerated 2d canvas
- * +auto+: Disable on Qt versions with known issues, enable otherwise
+ * +auto+: Disable on Qt6 < 6.6.0, enable otherwise
  * +never+: Enable accelerated 2d canvas
 
 Default: +pass:[auto]+
 
-[[qt.workarounds.disable_accessibility]]
-=== qt.workarounds.disable_accessibility
-Disable accessibility to avoid crashes on Qt 6.10.1.
-
-This setting requires a restart.
-
-This setting is only available with the QtWebEngine backend.
-
-Type: <<types,String>>
-
-Valid values:
-
- * +always+: Disable renderer accessibility
- * +auto+: Disable on Qt versions with known issues, enable otherwise
- * +never+: Enable renderer accessibility
-
-Default: +pass:[auto]+
-
 [[qt.workarounds.disable_hangouts_extension]]
 === qt.workarounds.disable_hangouts_extension
 Disable the Hangouts extension.

misc/org.qutebrowser.qutebrowser.appdata.xml

@@ -44,10 +44,6 @@
 	</content_rating>
 	<releases>
 <!-- Add new releases here -->
-<release version='3.6.3' date='2025-11-30'/>
-<release version='3.6.2' date='2025-11-27'/>
-<release version='3.6.1' date='2025-11-03'/>
-<release version='3.6.0' date='2025-10-24'/>
 <release version='3.5.1' date='2025-06-05'/>
 <release version='3.5.0' date='2025-04-12'/>
 <release version="3.4.0" date="2024-12-14"/>

misc/requirements/requirements-check-manifest.txt

@@ -0,0 +1,9 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+build==1.2.2.post1
+check-manifest==0.50
+importlib_metadata==8.7.0
+packaging==25.0
+pyproject_hooks==1.2.0
+tomli==2.2.1
+zipp==3.22.0

misc/requirements/requirements-check-manifest.txt-raw

@@ -0,0 +1 @@
+check-manifest

misc/requirements/requirements-dev.txt

@@ -1,73 +1,74 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 annotated-types==0.7.0
-anyio==4.12.0
+anyio==4.9.0
 autocommand==2.2.2
 backports.tarfile==1.2.0
-bracex==2.6
-build==1.3.0
-bump-my-version==1.2.5
-certifi==2025.11.12
-cffi==2.0.0
-charset-normalizer==3.4.4
+bracex==2.5.post1
+build==1.2.2.post1
+bump-my-version==1.1.4
+certifi==2025.4.26
+cffi==1.17.1
+charset-normalizer==3.4.2
 click==8.1.8
-cryptography==46.0.3
-docutils==0.22.3
-exceptiongroup==1.3.1
+cryptography==45.0.3
+docutils==0.21.2
+exceptiongroup==1.3.0
 github3.py==4.0.1
 h11==0.16.0
 httpcore==1.0.9
 httpx==0.28.1
-hunter==3.9.0
+hunter==3.7.0
 id==1.5.0
-idna==3.11
+idna==3.10
 importlib_metadata==8.7.0
 importlib_resources==6.5.2
 inflect==7.3.1
 jaraco.classes==3.4.0
 jaraco.collections==5.1.0
 jaraco.context==6.0.1
-jaraco.functools==4.0.1
+jaraco.functools==4.1.0
 jaraco.text==3.12.1
 jeepney==0.9.0
-keyring==25.7.0
+keyring==25.6.0
 manhole==1.8.1
 markdown-it-py==3.0.0
 mdurl==0.1.2
-more-itertools==10.8.0
-nh3==0.3.2
+more-itertools==10.7.0
+nh3==0.2.21
 packaging==25.0
-platformdirs==4.4.0
-prompt_toolkit==3.0.52
-pycparser==2.23
-pydantic==2.12.5
-pydantic-settings==2.11.0
-pydantic_core==2.41.5
-Pygments==2.19.2
+platformdirs==4.3.8
+prompt_toolkit==3.0.51
+pycparser==2.22
+pydantic==2.11.5
+pydantic-settings==2.9.1
+pydantic_core==2.33.2
+Pygments==2.19.1
 PyJWT==2.10.1
 Pympler==1.1
 pyproject_hooks==1.2.0
-PyQt-builder==1.19.1
+PyQt-builder==1.18.2
 python-dateutil==2.9.0.post0
-python-dotenv==1.2.1
-questionary==2.1.1
+python-dotenv==1.1.0
+questionary==2.1.0
 readme_renderer==44.0
-requests==2.32.5
+requests==2.32.3
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
-rich==14.2.0
-rich-click==1.9.4
+rich==14.0.0
+rich-click==1.8.9
 SecretStorage==3.3.3
-sip==6.14.0
+sip==6.12.0
 six==1.17.0
-tomli==2.3.0
-tomlkit==0.13.3
-twine==6.2.0
+sniffio==1.3.1
+tomli==2.2.1
+tomlkit==0.13.2
+twine==6.1.0
 typeguard==4.3.0
-typing-inspection==0.4.2
-typing_extensions==4.15.0
+typing-inspection==0.4.1
+typing_extensions==4.14.0
 uritemplate==4.2.0
-# urllib3==2.6.2
-wcmatch==10.1
-wcwidth==0.2.14
-zipp==3.23.0
+# urllib3==2.4.0
+wcmatch==10.0
+wcwidth==0.2.13
+zipp==3.22.0

misc/requirements/requirements-flake8.txt

@@ -1,10 +1,10 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==25.4.0
-flake8==7.3.0
+attrs==25.3.0
+flake8==7.2.0
 flake8-bugbear==24.12.12
-flake8-builtins==3.0.0
-flake8-comprehensions==3.17.0
+flake8-builtins==2.5.0
+flake8-comprehensions==3.16.0
 flake8-debugger==4.1.2
 flake8-deprecated==2.2.1
 flake8-docstrings==1.7.0
@@ -12,12 +12,12 @@ flake8-future-import==0.4.7
 flake8-plugin-utils==1.3.3
 flake8-pytest-style==2.1.0
 flake8-string-format==0.3.0
-flake8-tidy-imports==4.12.0
+flake8-tidy-imports==4.11.0
 flake8-tuple==0.4.1
 mccabe==0.7.0
 pep8-naming==0.15.1
-pycodestyle==2.14.0
+pycodestyle==2.13.0
 pydocstyle==6.3.0
-pyflakes==3.4.0
+pyflakes==3.3.2
 six==1.17.0
 snowballstemmer==3.0.1

misc/requirements/requirements-mypy.txt

@@ -1,20 +1,19 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 chardet==5.2.0
-diff_cover==10.0.0
+diff_cover==9.3.2
 Jinja2==3.1.6
-librt==0.7.3
-lxml==6.0.2
-MarkupSafe==3.0.3
-mypy==1.19.0
+lxml==5.4.0
+MarkupSafe==3.0.2
+mypy==1.16.0
 mypy_extensions==1.1.0
 pathspec==0.12.1
 pluggy==1.6.0
-Pygments==2.19.2
+Pygments==2.19.1
 PyQt5-stubs==5.15.6.0
-tomli==2.3.0
-types-colorama==0.4.15.20250801
-types-docutils==0.22.3.20251115
-types-Pygments==2.19.0.20251121
-types-PyYAML==6.0.12.20250915
-typing_extensions==4.15.0
+tomli==2.2.1
+types-colorama==0.4.15.20240311
+types-docutils==0.21.0.20250604
+types-Pygments==2.19.0.20250516
+types-PyYAML==6.0.12.20250516
+typing_extensions==4.14.0

misc/requirements/requirements-pyinstaller.txt

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

misc/requirements/requirements-pylint.txt

@@ -1,28 +1,26 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-astroid==3.3.11
-certifi==2025.11.12
-cffi==2.0.0
-charset-normalizer==3.4.4
-cryptography==46.0.3
+astroid==3.3.10
+certifi==2025.4.26
+cffi==1.17.1
+charset-normalizer==3.4.2
+cryptography==45.0.3
 dill==0.4.0
 github3.py==4.0.1
-idna==3.11
-importlib_metadata==8.7.0
-isort==6.1.0
+idna==3.10
+isort==6.0.1
 mccabe==0.7.0
 pefile==2024.8.26
-platformdirs==4.4.0
-pycparser==2.23
+platformdirs==4.3.8
+pycparser==2.22
 PyJWT==2.10.1
-pylint==3.3.9
+pylint==3.3.7
 python-dateutil==2.9.0.post0
 ./scripts/dev/pylint_checkers
-requests==2.32.5
+requests==2.32.3
 six==1.17.0
-tomli==2.3.0
-tomlkit==0.13.3
-typing_extensions==4.15.0
+tomli==2.2.1
+tomlkit==0.13.2
+typing_extensions==4.14.0
 uritemplate==4.2.0
-# urllib3==2.6.2
-zipp==3.23.0
+# urllib3==2.4.0

misc/requirements/requirements-pyqt-5.15.2.txt

@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 PyQt5==5.15.2  # rq.filter: == 5.15.2
-PyQt5_sip==12.17.1
+PyQt5_sip==12.17.0
 PyQtWebEngine==5.15.2  # rq.filter: == 5.15.2

misc/requirements/requirements-pyqt-5.15.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 PyQt5==5.15.11  # rq.filter: < 5.16
-PyQt5-Qt5==5.15.18
-PyQt5_sip==12.17.1
+PyQt5-Qt5==5.15.17
+PyQt5_sip==12.17.0
 PyQtWebEngine==5.15.7  # rq.filter: < 5.16
-PyQtWebEngine-Qt5==5.15.18
+PyQtWebEngine-Qt5==5.15.17

misc/requirements/requirements-pyqt-5.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 PyQt5==5.15.11
-PyQt5-Qt5==5.15.18
-PyQt5_sip==12.17.1
+PyQt5-Qt5==5.15.17
+PyQt5_sip==12.17.0
 PyQtWebEngine==5.15.7
-PyQtWebEngine-Qt5==5.15.18
+PyQtWebEngine-Qt5==5.15.17

misc/requirements/requirements-pyqt-6.10.txt

@@ -1,8 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt6==6.10.1
-PyQt6-Qt6==6.10.1
-PyQt6-WebEngine==6.10.0
-PyQt6-WebEngine-Qt6==6.10.1
-PyQt6_sip==13.10.2
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyqt-6.10.txt-raw

@@ -1,8 +0,0 @@
-PyQt6 >= 6.10, < 6.11
-PyQt6-Qt6 >= 6.10, < 6.11
-PyQt6-WebEngine >= 6.10, < 6.11
-PyQt6-WebEngine-Qt6 >= 6.10, < 6.11
-
-# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2025-October/046347.html
-#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyqt-6.9.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt6==6.9.1
-PyQt6-Qt6==6.9.2
+PyQt6==6.9.0
+PyQt6-Qt6==6.9.1
 PyQt6-WebEngine==6.9.0
-PyQt6-WebEngine-Qt6==6.9.2
+PyQt6-WebEngine-Qt6==6.9.1
 PyQt6_sip==13.10.2

misc/requirements/requirements-pyqt-6.txt

@@ -1,8 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt6==6.10.1
-PyQt6-Qt6==6.10.1
-PyQt6-WebEngine==6.10.0
-PyQt6-WebEngine-Qt6==6.10.1
+PyQt6==6.9.0
+PyQt6-Qt6==6.9.1
+PyQt6-WebEngine==6.9.0
+PyQt6-WebEngine-Qt6==6.9.1
 PyQt6_sip==13.10.2
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyqt-6.txt-raw

@@ -2,7 +2,3 @@ PyQt6
 PyQt6-Qt6
 PyQt6-WebEngine
 PyQt6-WebEngine-Qt6
-
-# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2025-October/046347.html
-#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyqt.txt

@@ -1,8 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt6==6.10.1
-PyQt6-Qt6==6.10.1
-PyQt6-WebEngine==6.10.0
-PyQt6-WebEngine-Qt6==6.10.1
+PyQt6==6.9.0
+PyQt6-Qt6==6.9.1
+PyQt6-WebEngine==6.9.0
+PyQt6-WebEngine-Qt6==6.9.1
 PyQt6_sip==13.10.2
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyqt.txt-raw

@@ -2,7 +2,3 @@ PyQt6
 PyQt6-Qt6
 PyQt6-WebEngine
 PyQt6-WebEngine-Qt6
-
-# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2025-October/046347.html
-#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
---extra-index-url https://www.riverbankcomputing.com/pypi/simple/

misc/requirements/requirements-pyroma.txt

@@ -1,18 +1,17 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-build==1.3.0
-certifi==2025.11.12
-charset-normalizer==3.4.4
-check-manifest==0.51
-docutils==0.22.3
-idna==3.11
+build==1.2.2.post1
+certifi==2025.4.26
+charset-normalizer==3.4.2
+docutils==0.21.2
+idna==3.10
 importlib_metadata==8.7.0
 packaging==25.0
-Pygments==2.19.2
+Pygments==2.19.1
 pyproject_hooks==1.2.0
-pyroma==5.0.1
-requests==2.32.5
-tomli==2.3.0
-trove-classifiers==2025.12.1.14
-urllib3==2.6.2
-zipp==3.23.0
+pyroma==4.2
+requests==2.32.3
+tomli==2.2.1
+trove-classifiers==2025.5.9.12
+urllib3==2.4.0
+zipp==3.22.0

misc/requirements/requirements-pyroma.txt-raw

@@ -1,2 +1 @@
 pyroma
-check-manifest

misc/requirements/requirements-sphinx.txt

@@ -2,17 +2,17 @@
 
 alabaster==0.7.16
 babel==2.17.0
-certifi==2025.11.12
-charset-normalizer==3.4.4
+certifi==2025.4.26
+charset-normalizer==3.4.2
 docutils==0.21.2
-idna==3.11
+idna==3.10
 imagesize==1.4.1
 importlib_metadata==8.7.0
 Jinja2==3.1.6
-MarkupSafe==3.0.3
+MarkupSafe==3.0.2
 packaging==25.0
-Pygments==2.19.2
-requests==2.32.5
+Pygments==2.19.1
+requests==2.32.3
 snowballstemmer==3.0.1
 Sphinx==7.4.7
 sphinxcontrib-applehelp==2.0.0
@@ -21,6 +21,6 @@ sphinxcontrib-htmlhelp==2.1.0
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==2.0.0
 sphinxcontrib-serializinghtml==2.0.0
-tomli==2.3.0
-urllib3==2.6.2
-zipp==3.23.0
+tomli==2.2.1
+urllib3==2.4.0
+zipp==3.22.0

misc/requirements/requirements-tests.txt

@@ -1,23 +1,23 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==25.4.0
+attrs==25.3.0
 autocommand==2.2.2
 backports.tarfile==1.2.0
-beautifulsoup4==4.14.3
+beautifulsoup4==4.13.4
 blinker==1.9.0
-certifi==2025.11.12
-charset-normalizer==3.4.4
-cheroot==11.1.2
+certifi==2025.4.26
+charset-normalizer==3.4.2
+cheroot==10.0.1
 click==8.1.8
-coverage==7.10.7
-exceptiongroup==1.3.1
-execnet==2.1.2
-filelock==3.19.1
-Flask==3.1.2
+coverage==7.8.2
+exceptiongroup==1.3.0
+execnet==2.1.1
+filelock==3.18.0
+Flask==3.1.1
 gherkin-official==29.0.0
-hunter==3.9.0
-hypothesis==6.141.1
-idna==3.11
+hunter==3.7.0
+hypothesis==6.135.0
+idna==3.10
 importlib_metadata==8.7.0
 importlib_resources==6.5.2
 inflect==7.3.1
@@ -25,43 +25,43 @@ iniconfig==2.1.0
 itsdangerous==2.2.0
 jaraco.collections==5.1.0
 jaraco.context==6.0.1
-jaraco.functools==4.0.1
+jaraco.functools==4.1.0
 jaraco.text==3.12.1
 # Jinja2==3.1.6
 Mako==1.3.10
 manhole==1.8.1
-# MarkupSafe==3.0.3
-more-itertools==10.8.0
+# MarkupSafe==3.0.2
+more-itertools==10.7.0
 packaging==25.0
 parse==1.20.2
-parse_type==0.6.6
-pillow==11.3.0
-platformdirs==4.4.0
+parse_type==0.6.4
+pillow==11.2.1
+platformdirs==4.3.8
 pluggy==1.6.0
 py-cpuinfo==9.0.0
-Pygments==2.19.2
-pytest==8.4.2
+Pygments==2.19.1
+pytest==8.4.0
 pytest-bdd==8.1.0
-pytest-benchmark==5.2.3
-pytest-cov==7.0.0
+pytest-benchmark==5.1.0
+pytest-cov==6.1.1
 pytest-instafail==0.5.0
-pytest-mock==3.15.1
-pytest-qt==4.5.0
+pytest-mock==3.14.1
+pytest-qt==4.4.0
 pytest-repeat==0.9.4
-pytest-rerunfailures==16.0.1
-pytest-xdist==3.8.0
+pytest-rerunfailures==15.1
+pytest-xdist==3.7.0
 pytest-xvfb==3.1.1
 PyVirtualDisplay==3.0
-requests==2.32.5
-requests-file==3.0.1
+requests==2.32.3
+requests-file==2.1.0
 six==1.17.0
 sortedcontainers==2.4.0
-soupsieve==2.8
+soupsieve==2.7
 tldextract==5.3.0
-tomli==2.3.0
+tomli==2.2.1
 typeguard==4.3.0
-typing_extensions==4.15.0
-urllib3==2.6.2
+typing_extensions==4.14.0
+urllib3==2.4.0
 vulture==2.14
-Werkzeug==3.1.4
-zipp==3.23.0
+Werkzeug==3.1.3
+zipp==3.22.0

misc/requirements/requirements-tox.txt

@@ -1,19 +1,19 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-cachetools==6.2.3
+cachetools==6.0.0
 chardet==5.2.0
 colorama==0.4.6
-distlib==0.4.0
-filelock==3.19.1
+distlib==0.3.9
+filelock==3.18.0
 packaging==25.0
-pip==25.3
-platformdirs==4.4.0
+pip==25.1.1
+platformdirs==4.3.8
 pluggy==1.6.0
 pyproject-api==1.9.1
 setuptools==80.9.0
-tomli==2.3.0
-tox==4.30.3 ; python_full_version!="3.14.0b1"
-typing_extensions==4.15.0
-virtualenv==20.35.4
+tomli==2.2.1
+tox==4.26.0 ; python_full_version!="3.14.0b1"
+typing_extensions==4.14.0
+virtualenv==20.31.2
 wheel==0.45.1
 tox @ git+https://github.com/tox-dev/tox ; python_full_version=="3.14.0b1"

misc/requirements/requirements-vulture.txt

@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-tomli==2.3.0
+tomli==2.2.1
 vulture==2.14

misc/requirements/requirements-yamllint.txt

@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 pathspec==0.12.1
-PyYAML==6.0.3
+PyYAML==6.0.2
 yamllint==1.37.1

misc/userscripts/password_fill

@@ -143,7 +143,7 @@ no_entries_found() {
 #    expected to write the username of that entry to the $username variable and
 #    the corresponding password to $password
 
-# shellcheck disable=SC2329
+# shellcheck disable=SC2317
 reset_backend() {
     init() { true ; }
     query_entries() { true ; }
@@ -199,8 +199,7 @@ choose_entry_zenity() {
 }
 
 choose_entry_zenity_radio() {
-    # shellcheck disable=SC2329
-    zenity_helper() {
+    zenity_helper() {  # shellcheck disable=SC2317
         awk '{ print $0 ; print $0 }'                   \
         | zenity --list --radiolist                     \
                  --title "qutebrowser password fill"    \
@@ -280,7 +279,7 @@ pass_backend() {
 
 # =======================================================
 # backend: secret
-# shellcheck disable=SC2329
+# shellcheck disable=SC2317
 secret_backend() {
     init() {
         return

misc/userscripts/qutedmenu

@@ -23,7 +23,7 @@ create_menu() {
     done < "$QUTE_CONFIG_DIR"/bookmarks/urls
 
     # Finally history
-        printf -- '%s\n' "$(sqlite3 -separator ' ' "$QUTE_DATA_DIR/history.sqlite" 'select title, url from CompletionHistory ORDER BY last_atime DESC')"
+        printf -- '%s\n' "$(sqlite3 -separator ' ' "$QUTE_DATA_DIR/history.sqlite" 'select title, url from CompletionHistory')"
     }
 
 get_selection() {

pyproject.toml

@@ -1,12 +0,0 @@
-[build-system]
-requires = ["setuptools>=42"]
-build-backend = "setuptools.build_meta"
-
-[tool.check-manifest]
-ignore = [
-    "qutebrowser/git-commit-id",
-    "qutebrowser/html/doc",
-    "qutebrowser/html/doc/*",
-    "qutebrowser/html/doc/img/cheatsheet-*.png",
-    "*/__pycache__",
-]

pytest.ini

@@ -1,5 +1,4 @@
 [pytest]
-pythonpath = .
 log_level = NOTSET
 addopts = --strict-markers --strict-config --instafail --benchmark-columns=Min,Max,Median
 testpaths = tests
@@ -43,8 +42,8 @@ markers =
     qt6_only: Tests which should only run with Qt 6
     qt5_xfail: Tests which fail with Qt 5
     qt6_xfail: Tests which fail with Qt 6
-    qt69_ci_flaky: Tests which are flaky with Qt 6.9+ on CI
-    qt69_ci_skip: Tests which should be skipped with Qt 6.9+ on CI
+    qt69_ci_flaky: Tests which are flaky with Qt 6.9 on CI
+    qt69_ci_skip: Tests which should be skipped with Qt 6.9 on CI
 qt_log_level_fail = WARNING
 qt_log_ignore =
     # GitHub Actions
@@ -92,9 +91,6 @@ qt_log_ignore =
     ^Unable to detect GPU vendor\.$
     # Qt 5 on CI with WebKit
     ^qglx_findConfig: Failed to finding matching FBConfig for QSurfaceFormat\(version 2\.0, options QFlags<QSurfaceFormat::FormatOption>\(\), depthBufferSize -1, redBufferSize 1, greenBufferSize 1, blueBufferSize 1, alphaBufferSize -1, stencilBufferSize -1, samples -1, swapBehavior QSurfaceFormat::SingleBuffer, swapInterval 1, colorSpace QSurfaceFormat::DefaultColorSpace, profile  QSurfaceFormat::NoProfile\)$
-    # Qt 6.8+ debug build
-    # https://github.com/qutebrowser/qutebrowser/issues/8069#issuecomment-2017644465
-    ^QObject::connect: Connecting from COMPAT signal \(QWebEnginePage::featurePermissionRequest(ed|Canceled)\(QUrl,QWebEnginePage::Feature\)\)
 xfail_strict = true
 filterwarnings =
     error
@@ -102,6 +98,8 @@ filterwarnings =
     # https://github.com/cucumber/gherkin/commit/2f4830093149eae7ff7bd82f683b3d3bb7320d39
     # https://github.com/pytest-dev/pytest-bdd/issues/752
     ignore:'maxsplit' is passed as positional argument:DeprecationWarning:gherkin.gherkin_line
+    # https://github.com/pytest-dev/pytest-mock/issues/468
+    ignore:'asyncio\.iscoroutinefunction' is deprecated and slated for removal:DeprecationWarning:pytest_mock.plugin
     # https://github.com/ionelmc/pytest-benchmark/issues/283
     ignore:FileType is deprecated\. Simply open files after parsing arguments\.:PendingDeprecationWarning:pytest_benchmark.plugin
 faulthandler_timeout = 90

qutebrowser/__init__.py

@@ -14,7 +14,7 @@ __copyright__ = "Copyright 2013-{} Florian Bruhin (The Compiler)".format(_year)
 __license__ = "GPL-3.0-or-later"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version__ = "3.6.3"
+__version__ = "3.5.1"
 __version_info__ = tuple(int(part) for part in __version__.split('.'))
 __description__ = "A keyboard-driven, vim-like browser based on Python and Qt."
 

qutebrowser/browser/browsertab.py

@@ -29,7 +29,7 @@ if TYPE_CHECKING:
 from qutebrowser.keyinput import modeman
 from qutebrowser.config import config, websettings
 from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils,
-                               urlutils, message, jinja)
+                               urlutils, message, jinja, version)
 from qutebrowser.misc import miscwidgets, objects, sessions
 from qutebrowser.browser import eventfilter, inspector
 from qutebrowser.qt import sip
@@ -1177,6 +1177,37 @@ class AbstractTab(QWidget):
                                   navigation.url.errorString()))
             navigation.accepted = False
 
+        # WORKAROUND for QtWebEngine >= 6.2 not allowing form requests from
+        # qute:// to outside domains.
+        needs_load_workarounds = (
+            objects.backend == usertypes.Backend.QtWebEngine and
+            version.qtwebengine_versions().webengine >= utils.VersionNumber(6, 2)
+        )
+        if (
+            needs_load_workarounds and
+            self.url() == QUrl("qute://start/") and
+            navigation.navigation_type == navigation.Type.form_submitted and
+            navigation.url.matches(
+                QUrl(config.val.url.searchengines['DEFAULT']),
+                urlutils.FormatOption.REMOVE_QUERY)
+        ):
+            log.webview.debug(
+                "Working around qute://start loading issue for "
+                f"{navigation.url.toDisplayString()}")
+            navigation.accepted = False
+            self.load_url(navigation.url)
+
+        if (
+            needs_load_workarounds and
+            self.url() == QUrl("qute://bookmarks/") and
+            navigation.navigation_type == navigation.Type.back_forward
+        ):
+            log.webview.debug(
+                "Working around qute://bookmarks loading issue for "
+                f"{navigation.url.toDisplayString()}")
+            navigation.accepted = False
+            self.load_url(navigation.url)
+
     @pyqtSlot(bool)
     def _on_load_finished(self, ok: bool) -> None:
         assert self._widget is not None

qutebrowser/browser/eventfilter.py

@@ -10,7 +10,7 @@ from qutebrowser.qt.gui import QKeyEvent
 from qutebrowser.qt.widgets import QWidget
 
 from qutebrowser.config import config
-from qutebrowser.utils import log, message, usertypes, qtutils, version, utils
+from qutebrowser.utils import log, message, usertypes, qtutils
 from qutebrowser.keyinput import modeman, keyutils
 
 
@@ -55,16 +55,16 @@ class ChildEventFilter(QObject):
                 # - This is a child event filter on a tab (self._widget is not None)
                 # - We find an old existing child which is a QQuickWidget and is
                 #   currently focused.
-                # - We're using an affected QtWebEngine version
+                # - We're using QtWebEngine >= 6.4 (older versions are not affected)
                 children = [
                     c for c in self._widget.findChildren(
                         QWidget, "", Qt.FindChildOption.FindDirectChildrenOnly)
                     if c is not child and
                     c.hasFocus() and
                     c.metaObject() is not None and
-                    c.metaObject().className() == "QQuickWidget"  # Qt 6.4+
+                    c.metaObject().className() == "QQuickWidget"
                 ]
-                if children and version.qtwebengine_versions().webengine < utils.VersionNumber(6, 6, 3):
+                if children:
                     log.misc.debug("Focusing new child")
                     child.setFocus()
 

qutebrowser/browser/qutescheme.py

@@ -123,24 +123,25 @@ def data_for_url(url: QUrl) -> tuple[str, bytes]:
 
     path = url.path()
     host = url.host()
+    query = url.query()
     # A url like "qute:foo" is split as "scheme:path", not "scheme:host".
     log.misc.debug("url: {}, path: {}, host {}".format(
         url.toDisplayString(), path, host))
+    if not path or not host:
+        new_url = QUrl()
+        new_url.setScheme('qute')
+        # When path is absent, e.g. qute://help (with no trailing slash)
+        if host:
+            new_url.setHost(host)
+        # When host is absent, e.g. qute:help
+        else:
+            new_url.setHost(path)
 
-    if not host:
-        # Redirect qute:help -> qute://help/
-        new_url = QUrl(url)
-        new_url.setHost(path)
         new_url.setPath('/')
-        if not new_url.host():  # Valid path but not valid host
-            raise UrlInvalidError(f"Invalid host (from path): {path!r}")
-        raise Redirect(new_url)
-
-    if not path:
-        # Redirect qute://help -> qute://help/
-        new_url = QUrl(url)
-        new_url.setPath('/')
-        raise Redirect(new_url)
+        if query:
+            new_url.setQuery(query)
+        if new_url.host():  # path was a valid host
+            raise Redirect(new_url)
 
     try:
         handler = _HANDLERS[host]

qutebrowser/browser/webengine/webenginesettings.py

@@ -417,37 +417,6 @@ def _init_profile(profile: QWebEngineProfile) -> None:
         lambda url: profile.clearVisitedLinks([url]))
 
     _global_settings.init_settings()
-    _maybe_disable_hangouts_extension(profile)
-
-
-def _maybe_disable_hangouts_extension(profile: QWebEngineProfile) -> None:
-    """Disable the Hangouts extension for Qt 6.10+."""
-    if not config.val.qt.workarounds.disable_hangouts_extension:
-        return
-
-    if machinery.IS_QT6:  # mypy
-        try:
-            ext_manager = profile.extensionManager()
-        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:
-                log.misc.debug(f"Disabling extension: {info.name()}")
-                # setExtensionEnabled(info, False) seems to segfault
-                ext_manager.unloadExtension(info)
 
 
 def _clear_webengine_permissions_json():
@@ -469,18 +438,14 @@ 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
-    default_profile = default_qt_profile()
+
+    if machinery.IS_QT6:
+        default_profile = QWebEngineProfile("Default")
+    else:
+        default_profile = QWebEngineProfile.defaultProfile()
     assert not default_profile.isOffTheRecord()
 
     assert parsed_user_agent is None  # avoid earlier profile initialization
@@ -541,21 +506,7 @@ def _init_site_specific_quirks():
     #               "{qt_key}/{qt_version} "
     #               "{upstream_browser_key}/{upstream_browser_version_short} "
     #               "Safari/{webkit_version}")
-    firefox_ua = "Mozilla/5.0 ({os_info}; rv:145.0) Gecko/20100101 Firefox/145.0"
-
-    # Needed for gitlab.gnome.org which blocks old Chromium versions outright,
-    # except when QtWebEngine/... is in the UA.
-    #
-    # We could further modify the UA to just "qutebrowser" or something so we don't get
-    # Anubis at all, but it looks like their Anubis triggers to more than just
-    # Mozilla/5.0 (also AppleWebKit/... and Chromium/... possibly?), so at that point
-    # I'm not sure if we can strip down the UA so much without breaking
-    # something in GitLab as well.
-    not_mozilla_ua = (
-        "Mozilla/5.0 ({os_info}) AppleWebKit/{webkit_version} (KHTML, like Gecko) "
-        "{qt_key}/{qt_version} {upstream_browser_key}/{upstream_browser_version_short} "
-        "Safari/{webkit_version}"
-    )
+    firefox_ua = "Mozilla/5.0 ({os_info}; rv:136.0) Gecko/20100101 Firefox/139.0"
 
     def maybe_newer_chrome_ua(at_least_version):
         """Return a new UA if our current chrome version isn't at least at_least_version."""
@@ -577,7 +528,6 @@ def _init_site_specific_quirks():
         # to keep your account secure" error.
         # https://github.com/qutebrowser/qutebrowser/issues/5182
         ("ua-google", "https://accounts.google.com/*", firefox_ua),
-        ("ua-gnome-gitlab", "https://gitlab.gnome.org/*", not_mozilla_ua),
     ]
 
     for name, pattern, ua in user_agents:

qutebrowser/browser/webengine/webenginetab.py

@@ -13,7 +13,7 @@ import html as html_utils
 from typing import cast, Union, Optional
 
 from qutebrowser.qt.core import (pyqtSignal, pyqtSlot, Qt, QPoint, QPointF, QUrl,
-                          QObject, QByteArray, QTimer)
+                          QObject, QByteArray)
 from qutebrowser.qt.network import QAuthenticator
 from qutebrowser.qt.webenginecore import QWebEnginePage, QWebEngineScript, QWebEngineHistory
 
@@ -940,10 +940,6 @@ class _WebEnginePermissions(QObject):
                 notif = miscwidgets.FullscreenNotification(self._widget)
                 notif.set_timeout(timeout)
                 notif.show()
-                # Restore keyboard focus to the tab. Setting a NoFocus policy
-                # for FullscreenNotification doesn't seem to work.
-                if self._widget.isVisible():
-                    self._widget.setFocus()
 
     @pyqtSlot(QUrl, 'QWebEnginePage::Feature')
     def _on_feature_permission_requested(self, url, feature):
@@ -1623,7 +1619,6 @@ class WebEngineTab(browsertab.AbstractTab):
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
 
-        # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-103778
         local_schemes = {"qute", "file"}
         qtwe_ver = version.qtwebengine_versions().webengine
         if (
@@ -1636,6 +1631,7 @@ class WebEngineTab(browsertab.AbstractTab):
             (utils.VersionNumber(6, 2) <= qtwe_ver < utils.VersionNumber(6, 2, 5) or
              utils.VersionNumber(6, 3) <= qtwe_ver < utils.VersionNumber(6, 3, 1))
         ):
+            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-103778
             log.webview.debug(
                 "Working around blocked request from local page "
                 f"{self.url().toDisplayString()}"
@@ -1643,51 +1639,6 @@ class WebEngineTab(browsertab.AbstractTab):
             navigation.accepted = False
             self.load_url(navigation.url)
 
-        # WORKAROUND for QtWebEngine >= 6.2 not allowing form requests from
-        # qute:// to outside domains.
-        if (
-            qtwe_ver >= utils.VersionNumber(6, 2) and
-            self.url() == QUrl("qute://start/") and
-            navigation.navigation_type == navigation.Type.form_submitted and
-            navigation.url.matches(
-                QUrl(config.val.url.searchengines['DEFAULT']),
-                urlutils.FormatOption.REMOVE_QUERY)
-        ):
-            log.webview.debug(
-                "Working around qute://start loading issue for "
-                f"{navigation.url.toDisplayString()}")
-            navigation.accepted = False
-            # Using QTimer.singleShot as WORKAROUND for this crashing otherwise
-            # with QtWebEngine 6.10: https://bugreports.qt.io/browse/QTBUG-140543
-            QTimer.singleShot(0, functools.partial(self.load_url, navigation.url))
-
-        # WORKAROUND for QtWebEngine 6.2 - 6.5 blocking back/forward navigation too
-        if (
-            utils.VersionNumber(6, 6) > qtwe_ver >= utils.VersionNumber(6, 2) and
-            self.url() == QUrl("qute://bookmarks/") and
-            navigation.navigation_type == navigation.Type.back_forward
-        ):
-            log.webview.debug(
-                "Working around qute://bookmarks loading issue for "
-                f"{navigation.url.toDisplayString()}")
-            navigation.accepted = False
-            self.load_url(navigation.url)
-
-        # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-140515
-        ua_setting = "content.headers.user_agent"
-        if (
-            navigation.accepted
-            and config.instance.get(ua_setting, navigation.url, fallback=False)
-            is not usertypes.UNSET
-            and navigation.navigation_type == usertypes.NavigationRequest.Type.redirect
-            and navigation.is_main_frame
-            and utils.VersionNumber(6, 5) <= qtwe_ver < utils.VersionNumber(6, 10, 1)
-        ):
-            navigation.accepted = False
-            # Using QTimer.singleShot as WORKAROUND for this crashing otherwise
-            # with QtWebEngine 6.10: https://bugreports.qt.io/browse/QTBUG-140543
-            QTimer.singleShot(0, functools.partial(self.load_url, navigation.url))
-
         if not navigation.accepted or not navigation.is_main_frame:
             return
 

qutebrowser/config/config.py

@@ -333,13 +333,8 @@ class Config(QObject):
                                    pattern, hide_userconfig=hide_userconfig)
 
         self.changed.emit(opt.name)
-
-        if pattern is not None:
-            log.config.debug("Config option changed: {} = {} for {}".format(
-                opt.name, value, pattern))
-        else:
-            log.config.debug("Config option changed: {} = {}".format(
-                opt.name, value))
+        log.config.debug("Config option changed: {} = {}".format(
+            opt.name, value))
 
     def _check_yaml(self, opt: 'configdata.Option', save_yaml: bool) -> None:
         """Make sure the given option may be set in autoconfig.yml."""

qutebrowser/config/configcommands.py

@@ -356,8 +356,9 @@ class ConfigCommands:
             raise cmdutils.CommandError(":config-list-remove can only be used "
                                         "for lists")
 
+        converted = opt.typ.valtype.from_str(value)
+
         with self._handle_config_error():
-            converted = opt.typ.valtype.from_str(value)
             option_value = self._config.get_mutable_obj(option)
 
             if converted not in option_value:

qutebrowser/config/configdata.yml

@@ -391,7 +391,7 @@ qt.workarounds.disable_accelerated_2d_canvas:
     name: String
     valid_values:
       - always: Disable accelerated 2d canvas
-      - auto: Disable on Qt versions with known issues, enable otherwise
+      - auto: Disable on Qt6 < 6.6.0, enable otherwise
       - never: Enable accelerated 2d canvas
   default: auto
   backend: QtWebEngine
@@ -422,19 +422,6 @@ qt.workarounds.disable_hangouts_extension:
     disabled to avoid crashes on Qt 6.5.0 to 6.5.3 if dark mode is enabled,
     as well as on Qt 6.6.0.
 
-qt.workarounds.disable_accessibility:
-  type:
-    name: String
-    valid_values:
-      - always: Disable renderer accessibility
-      - auto: Disable on Qt versions with known issues, enable otherwise
-      - never: Enable renderer accessibility
-  default: auto
-  backend: QtWebEngine
-  restart: true
-  desc: >-
-    Disable accessibility to avoid crashes on Qt 6.10.1.
-
 ## auto_save
 
 auto_save.interval:
@@ -671,7 +658,6 @@ content.site_specific_quirks.skip:
     valid_values:
       - ua-google
       - ua-googledocs
-      - ua-gnome-gitlab
       - js-whatsapp-web
       - js-discord
       - js-string-replaceall
@@ -786,14 +772,14 @@ content.headers.user_agent:
       # Vim-protip: Place your cursor below this comment and run
       # :r!python scripts/dev/ua_fetch.py
       - - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36
-          (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"
-        - Chrome 142 macOS
+          (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36"
+        - Chrome 137 macOS
       - - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML,
-          like Gecko) Chrome/142.0.0.0 Safari/537.36"
-        - Chrome 142 Win10
+          like Gecko) Chrome/137.0.0.0 Safari/537.36"
+        - Chrome 137 Win10
       - - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like
-          Gecko) Chrome/142.0.0.0 Safari/537.36"
-        - Chrome 142 Linux
+          Gecko) Chrome/137.0.0.0 Safari/537.36"
+        - Chrome 137 Linux
   supports_pattern: true
   desc: |
     User agent to send.
@@ -1616,7 +1602,6 @@ fileselect.single_file.command:
       - ['["xterm", "-e", "nnn", "-p", "{}"]', "nnn in xterm"]
       - ['["xterm", "-e", "fff", "-p", "{}"]', "fff in xterm"]
       - ['["xterm", "-e", "lf", "-selection-path", "{}"]', "lf in xterm"]
-      - ['["xterm", "-e", "yazi", "--chooser-file", "{}"]', "yazi in xterm"]
   default: ['xterm', '-e', 'ranger', '--choosefile={}']
   desc: >-
     Command (and arguments) to use for selecting a single file in forms.
@@ -1637,7 +1622,6 @@ fileselect.multiple_files.command:
       - ['["xterm", "-e", "nnn", "-p", "{}"]', "nnn in xterm"]
       - ['["xterm", "-e", "fff", "-p", "{}"]', "fff in xterm"]
       - ['["xterm", "-e", "lf", "-selection-path", "{}"]', "lf in xterm"]
-      - ['["xterm", "-e", "yazi", "--chooser-file", "{}"]', "yazi in xterm"]
   default: ['xterm', '-e', 'ranger', '--choosefiles={}']
   desc: >-
     Command (and arguments) to use for selecting multiple files in forms.
@@ -1657,7 +1641,6 @@ fileselect.folder.command:
       - ['["xterm", "-e", "ranger", "--choosedir={}"]', "Ranger in xterm"]
       - ['["xterm", "-e", "vifm", "--choose-dir", "{}"]', "vifm in xterm"]
       - ['["xterm", "-e", "nnn", "-p", "{}"]', "nnn in xterm"]
-      - ['["xterm", "-e", "yazi", "--cwd-file", "{}"]', "yazi in xterm"]
   default: ['xterm', '-e', 'ranger', '--choosedir={}']
   desc: >-
     Command (and arguments) to use for selecting a single folder in forms.

qutebrowser/config/qtargs.py

@@ -156,12 +156,12 @@ def _qtwebengine_features(  # noqa: C901
 
     if versions.webengine >= utils.VersionNumber(6, 7):
         # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-132681
-        # TODO adjust if fixed in Qt 6.9.2+
+        # TODO adjust if fixed in Qt 6.8.2/.3 or 6.9.0/.1
         disabled_features.append('DocumentPictureInPictureAPI')
 
-    if utils.VersionNumber(6, 9) <= versions.webengine < utils.VersionNumber(6, 10, 1):
+    if versions.webengine == utils.VersionNumber(6, 9):
         # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-135787
-        # and https://bugreports.qt.io/browse/QTBUG-141096
+        # TODO adjust if still present in 6.9.1
         disabled_features.append('PermissionElement')
 
     if not config.val.input.media_keys:
@@ -356,21 +356,7 @@ _WEBENGINE_SETTINGS: dict[str, dict[Any, Optional[_SettingValueType]]] = {
     'qt.workarounds.disable_accelerated_2d_canvas': {
         'always': '--disable-accelerated-2d-canvas',
         'never': None,
-        'auto': lambda versions: '--disable-accelerated-2d-canvas'
-        if machinery.IS_QT6
-        and versions.webengine
-        and versions.webengine < utils.VersionNumber(6, 8, 2)
-        else None,
-    },
-    'qt.workarounds.disable_accessibility': {
-        'always': '--disable-renderer-accessibility',
-        'never': None,
-        # WORKAROUND for https://qt-project.atlassian.net/browse/QTBUG-142320
-        'auto': lambda versions: '--disable-renderer-accessibility'
-        if machinery.IS_QT6
-        and versions.webengine
-        and versions.webengine == utils.VersionNumber(6, 10, 1)
-        else None,
+        'auto': lambda _versions: '--disable-accelerated-2d-canvas' if machinery.IS_QT6 else None,
     },
 }
 

qutebrowser/html/no_pdfjs.html

@@ -92,7 +92,7 @@ li {
             the required packages for pdf.js are also installed.
             <br/>
             The package is named
-            <a href="https://archlinux.org/packages/extra/any/pdfjs-legacy/"><b>pdfjs-legacy</b></a> on Archlinux
+            <a href="https://archlinux.org/packages/community/any/pdfjs/"><b>pdfjs</b></a> on Archlinux
             and <a href="https://packages.debian.org/bullseye/libjs-pdf"><b>libjs-pdf</b></a> on Debian.
           </li>
 

qutebrowser/javascript/webelem.js

@@ -191,51 +191,36 @@ window._qutebrowser.webelem = (function() {
         }
     }
 
-    // Recursively finds elements from DOM that have a shadowRoot
-    // and returns the shadow roots in a list
-    function find_shadow_roots(container = document) {
-        const roots = [];
-
-        for (const elem of container.querySelectorAll("*")) {
-            if (elem.shadowRoot) {
-                roots.push(elem.shadowRoot, ...find_shadow_roots(elem.shadowRoot));
-            }
-        }
-
-        return roots;
-    }
-
     funcs.find_css = (selector, only_visible) => {
-        // Find all places where we need to look for elements:
-        const containers = [[document, null]];
-        // Same-domain iframes
-        for (const frame of Array.from(window.frames)) {
-            if (iframe_same_domain(frame)) {
-                containers.push([frame.document, frame]);
-            }
-        }
-        // Open shadow roots
-        for (const root of find_shadow_roots()) {
-            containers.push([root, null]);
+        let elems;
+
+        try {
+            elems = document.querySelectorAll(selector);
+        } catch (ex) {
+            return {"success": false, "error": ex.toString()};
         }
 
-        // Then find elements in all of them
-        const elems = [];
-        for (const [container, frame] of containers) {
-            try {
-                for (const elem of container.querySelectorAll(selector)) {
-                    elems.push([elem, frame]);
-                }
-            } catch (ex) {
-                return {"success": false, "error": ex.toString()};
-            }
-        }
-
-        // Finally, filter by visibility
+        const subelem_frames = window.frames;
         const out = [];
-        for (const [elem, frame] of elems) {
-            if (!only_visible || is_visible(elem, frame)) {
-                out.push(serialize_elem(elem, frame));
+
+        for (let i = 0; i < elems.length; ++i) {
+            if (!only_visible || is_visible(elems[i])) {
+                out.push(serialize_elem(elems[i]));
+            }
+        }
+
+        // Recurse into frames and add them
+        for (let i = 0; i < subelem_frames.length; i++) {
+            if (iframe_same_domain(subelem_frames[i])) {
+                const frame = subelem_frames[i];
+                const subelems = frame.document.
+                    querySelectorAll(selector);
+                for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
+                    if (!only_visible ||
+                        is_visible(subelems[elem_num], frame)) {
+                        out.push(serialize_elem(subelems[elem_num], frame));
+                    }
+                }
             }
         }
 

qutebrowser/mainwindow/mainwindow.py

@@ -562,7 +562,7 @@ class MainWindow(QWidget):
             self._completion.on_clear_completion_selection)
         self.status.cmd.hide_completion.connect(
             self._completion.hide)
-        self.status.release_focus.connect(self.tabbed_browser.on_release_focus)
+        self.status.cmd.hide_cmd.connect(self.tabbed_browser.on_release_focus)
 
     def _set_decoration(self, hidden):
         """Set the visibility of the window decoration via Qt."""

qutebrowser/mainwindow/prompt.py

@@ -342,9 +342,9 @@ class PromptContainer(QWidget):
         """Leave KEY_MODE whenever a prompt is aborted."""
         try:
             modeman.leave(self._win_id, key_mode, 'aborted', maybe=True)
-        except (objreg.RegistryUnavailableError, RuntimeError):
+        except objreg.RegistryUnavailableError:
             # window was deleted: ignore
-            log.prompt.debug(f"Ignoring leaving {key_mode} as window was deleted")
+            pass
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_prompt_done(self, key_mode):
@@ -654,12 +654,6 @@ class FilenamePrompt(_BasePrompt):
 
     """A prompt for a filename."""
 
-    # Note: This *must* be a class variable! If it's not, for unknown reasons,
-    # we get a segfault in Qt/PyQt in QFileInfoGatherer::getInfo() if we have
-    # nested download prompts (i.e. trigger a download while a download prompt
-    # is open already).
-    _null_icon_provider = NullIconProvider()
-
     def __init__(self, question, parent=None):
         super().__init__(question, parent)
         self._init_texts(question)
@@ -759,7 +753,7 @@ class FilenamePrompt(_BasePrompt):
         self._file_model = QFileSystemModel(self)
 
         # avoid icon and mime type lookups, they are slow in Qt6
-        self._file_model.setIconProvider(self._null_icon_provider)
+        self._file_model.setIconProvider(NullIconProvider())
 
         self._file_view.setModel(self._file_model)
         self._file_view.clicked.connect(self._insert_path)

qutebrowser/mainwindow/statusbar/bar.py

@@ -140,12 +140,10 @@ class StatusBar(QWidget):
         moved: Emitted when the statusbar has moved, so the completion widget
                can move to the right position.
                arg: The new position.
-        release_focus: Emitted just before the statusbar is hidden.
     """
 
     resized = pyqtSignal('QRect')
     moved = pyqtSignal('QPoint')
-    release_focus = pyqtSignal()
 
     STYLESHEET = _generate_stylesheet()
 
@@ -367,7 +365,6 @@ class StatusBar(QWidget):
     def _hide_cmd_widget(self):
         """Show temporary text instead of command widget."""
         log.statusbar.debug("Hiding cmd widget")
-        self.release_focus.emit()
         self._stack.setCurrentWidget(self.txt)
         self.maybe_hide()
 

qutebrowser/misc/backendproblem.py

@@ -422,37 +422,6 @@ class _BackendProblemChecker:
 
         raise utils.Unreachable
 
-    def _force_wayland_hardware_acceleration(self) -> None:
-        """Set environment variable so hardware acceleration works on Wayland.
-
-        Set EGL_PLATFORM=wayland to force ANGLE to obtain EGL display connection
-        for wayland platform. Otherwise, the display connection for
-        EGL_DEFAULT_DISPLAY may belong to a platform which Nvidia's EGL driver
-        doesn't support. In case of unsupported platform, EGL may fallback to
-        Mesa software renderer (LLVMPipe) disabling hardware acceleration in
-        Chromium.
-
-        Equivalent to:
-        https://codereview.qt-project.org/c/qt/qtwebengine/+/663568
-        """
-        if objects.qapp.platformName() != 'wayland':
-            return
-
-        versions = version.qtwebengine_versions(avoid_init=True)
-        if versions.webengine >= utils.VersionNumber(6, 10):
-            # Qt workaround is active
-            return
-
-        egl_platform_var = "EGL_PLATFORM"
-        egl_platform = os.environ.get(egl_platform_var)
-        if not egl_platform:
-            os.environ[egl_platform_var] = "wayland"
-        elif egl_platform != "wayland":
-            log.init.warning(
-                f"{egl_platform_var} environment variable is set to {egl_platform!r}. "
-                "This may break hardware rendering on Wayland."
-            )
-
     def _assert_backend(self, backend: usertypes.Backend) -> None:
         assert objects.backend == backend, objects.backend
 
@@ -464,7 +433,6 @@ class _BackendProblemChecker:
             self._handle_ssl_support()
             self._handle_serviceworker_nuking()
             self._check_software_rendering()
-            self._force_wayland_hardware_acceleration()
             self._confirm_chromium_version_changes()
         else:
             self._assert_backend(usertypes.Backend.QtWebKit)

qutebrowser/misc/crashdialog.py

@@ -48,8 +48,8 @@ def parse_fatal_stacktrace(text):
     lines = [
         r'(?P<type>Fatal Python error|Windows fatal exception): (?P<msg>.*)',
         r' *',
-        r'(Current )?[Tt]hread .* \(most recent call first\): *',
-        r'  (File ".*", line \d+ in (?P<func>.*)|<no Python frame>)',
+        r'(Current )?[Tt]hread [^ ]* \(most recent call first\): *',
+        r'  File ".*", line \d+ in (?P<func>.*)',
     ]
     m = re.search('\n'.join(lines), text)
     if m is None:
@@ -58,7 +58,7 @@ def parse_fatal_stacktrace(text):
     else:
         msg = m.group('msg')
         typ = m.group('type')
-        func = m.group('func') or ''
+        func = m.group('func')
         if typ == 'Windows fatal exception':
             msg = 'Windows ' + msg
         return msg, func

qutebrowser/misc/earlyinit.py

@@ -23,7 +23,6 @@ import datetime
 from typing import NoReturn
 try:
     import tkinter
-    import tkinter.messagebox
 except ImportError:
     tkinter = None  # type: ignore[assignment]
 

qutebrowser/misc/pakjoy.py

@@ -26,7 +26,6 @@ instead of crashing.
 """
 
 import os
-import sys
 import shutil
 import pathlib
 import dataclasses
@@ -36,13 +35,9 @@ from collections.abc import Iterator
 
 from qutebrowser.config import config
 from qutebrowser.misc import binparsing, objects
-from qutebrowser.qt import core
 from qutebrowser.utils import qtutils, standarddir, version, utils, log, message
-from qutebrowser.qt.webenginecore import QWebEngineProfile
 
-
-HANGOUTS_EXT_ID = "nkeimhogjdpnpccoofpliimaahmaaome"
-HANGOUTS_MARKER = f"// Extension ID: {HANGOUTS_EXT_ID}".encode("utf-8")
+HANGOUTS_MARKER = b"// Extension ID: nkeimhogjdpnpccoofpliimaahmaaome"
 HANGOUTS_IDS = [
     # Linux
     47222,  # QtWebEngine 6.9 Beta 3
@@ -62,11 +57,7 @@ PAK_VERSION = 5
 RESOURCES_ENV_VAR = "QTWEBENGINE_RESOURCES_PATH"
 DISABLE_ENV_VAR = "QUTE_DISABLE_PAKJOY"
 CACHE_DIR_NAME = "webengine_resources_pak_quirk"
-PAK_FILENAME = (
-    "qtwebengine_resources.debug.pak"
-    if core.QLibraryInfo.isDebugBuild()
-    else "qtwebengine_resources.pak"
-)
+PAK_FILENAME = "qtwebengine_resources.pak"
 
 TARGET_URL = b"https://*.google.com/*"
 REPLACEMENT_URL = b"https://qute.invalid/*"
@@ -231,7 +222,7 @@ def copy_webengine_resources() -> Optional[pathlib.Path]:
         )
         # https://github.com/qutebrowser/qutebrowser/issues/8257
         or config.val.qt.workarounds.disable_hangouts_extension
-    ) or hasattr(QWebEngineProfile, "extensionManager"):  # Qt 6.10+
+    ):
         # No patching needed
         return None
 
@@ -312,16 +303,3 @@ def patch_webengine() -> Iterator[None]:
         del os.environ[RESOURCES_ENV_VAR]
     else:
         os.environ[RESOURCES_ENV_VAR] = old_value
-
-
-def main() -> None:
-    with open(sys.argv[1], "rb") as f:
-        parser = PakParser(f)
-        print(parser.manifest.decode("utf-8"))
-        print()
-        print(f"entry: {parser.manifest_entry}")
-        print(f"URL offset: {parser.find_patch_offset()}")
-
-
-if __name__ == "__main__":
-    main()

qutebrowser/misc/wmname.py

@@ -1,325 +0,0 @@
-# SPDX-FileCopyrightText: Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Utilities to get the name of the window manager (X11) / compositor (Wayland)."""
-
-from typing import NewType
-from collections.abc import Iterator
-import ctypes
-import socket
-import struct
-import pathlib
-import dataclasses
-import contextlib
-import ctypes.util
-
-
-class Error(Exception):
-    """Base class for errors in this module."""
-
-
-class _WaylandDisplayStruct(ctypes.Structure):
-    pass
-
-
-_WaylandDisplay = NewType("_WaylandDisplay", "ctypes._Pointer[_WaylandDisplayStruct]")
-
-
-def _load_library(name: str) -> ctypes.CDLL:
-    lib = ctypes.util.find_library(name)
-    if lib is None:
-        raise Error(f"{name} library not found")
-
-    try:
-        return ctypes.CDLL(lib)
-    except OSError as e:
-        raise Error(f"Failed to load {name} library: {e}")
-
-
-def _pid_from_fd(fd: int) -> int:
-    """Get the process ID from a file descriptor using SO_PEERCRED.
-
-    https://stackoverflow.com/a/35827184
-    """
-    if not hasattr(socket, "SO_PEERCRED"):
-        raise Error("Missing socket.SO_PEERCRED")
-
-    # struct ucred {
-    #    pid_t pid;
-    #    uid_t uid;
-    #    gid_t gid;
-    # };  // where all of those are integers
-    ucred_format = "3i"
-    ucred_size = struct.calcsize(ucred_format)
-
-    try:
-        sock = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM)
-    except OSError as e:
-        raise Error(f"Error creating socket for fd {fd}: {e}")
-
-    try:
-        ucred = sock.getsockopt(socket.SOL_SOCKET, socket.SO_PEERCRED, ucred_size)
-    except OSError as e:
-        raise Error(f"Error getting SO_PEERCRED for fd {fd}: {e}")
-    finally:
-        sock.close()
-
-    pid, _uid, _gid = struct.unpack(ucred_format, ucred)
-    return pid
-
-
-def _process_name_from_pid(pid: int) -> str:
-    """Get the process name from a PID by reading /proc/[pid]/cmdline."""
-    proc_path = pathlib.Path(f"/proc/{pid}/cmdline")
-    try:
-        return proc_path.read_text(encoding="utf-8").replace("\0", " ").strip()
-    except OSError as e:
-        raise Error(f"Error opening {proc_path}: {e}")
-
-
-@contextlib.contextmanager
-def _wayland_display(wayland_client: ctypes.CDLL) -> Iterator[_WaylandDisplay]:
-    """Context manager to connect to a Wayland display."""
-    wayland_client.wl_display_connect.argtypes = [ctypes.c_char_p]  # name
-    wayland_client.wl_display_connect.restype = ctypes.POINTER(_WaylandDisplayStruct)
-
-    wayland_client.wl_display_disconnect.argtypes = [
-        ctypes.POINTER(_WaylandDisplayStruct)
-    ]
-    wayland_client.wl_display_disconnect.restype = None
-
-    display = wayland_client.wl_display_connect(None)
-    if not display:
-        raise Error("Can't connect to display")
-
-    try:
-        yield display
-    finally:
-        wayland_client.wl_display_disconnect(display)
-
-
-def _wayland_get_fd(wayland_client: ctypes.CDLL, display: _WaylandDisplay) -> int:
-    """Get the file descriptor for the Wayland display."""
-    wayland_client.wl_display_get_fd.argtypes = [ctypes.POINTER(_WaylandDisplayStruct)]
-    wayland_client.wl_display_get_fd.restype = ctypes.c_int
-
-    fd = wayland_client.wl_display_get_fd(display)
-    if fd < 0:
-        raise Error(f"Failed to get Wayland display file descriptor: {fd}")
-    return fd
-
-
-def wayland_compositor_name() -> str:
-    """Get the name of the running Wayland compositor.
-
-    Approach based on:
-    https://stackoverflow.com/questions/69302630/wayland-client-get-compositor-name
-    """
-    wayland_client = _load_library("wayland-client")
-    with _wayland_display(wayland_client) as display:
-        fd = _wayland_get_fd(wayland_client, display)
-        pid = _pid_from_fd(fd)
-        process_name = _process_name_from_pid(pid)
-        return process_name
-
-
-@dataclasses.dataclass
-class _X11Atoms:
-    NET_SUPPORTING_WM_CHECK: int
-    NET_WM_NAME: int
-    UTF8_STRING: int
-
-
-class _X11DisplayStruct(ctypes.Structure):
-    pass
-
-
-_X11Display = NewType("_X11Display", "ctypes._Pointer[_X11DisplayStruct]")
-_X11Window = NewType("_X11Window", int)
-
-
-@contextlib.contextmanager
-def _x11_open_display(xlib: ctypes.CDLL) -> Iterator[_X11Display]:
-    """Open a connection to the X11 display."""
-    xlib.XOpenDisplay.argtypes = [ctypes.c_char_p]
-    xlib.XOpenDisplay.restype = ctypes.POINTER(_X11DisplayStruct)
-
-    xlib.XCloseDisplay.argtypes = [ctypes.POINTER(_X11DisplayStruct)]
-    xlib.XCloseDisplay.restype = None
-
-    display = xlib.XOpenDisplay(None)
-    if not display:
-        raise Error("Cannot open display")
-
-    try:
-        yield display
-    finally:
-        xlib.XCloseDisplay(display)
-
-
-def _x11_intern_atom(
-    xlib: ctypes.CDLL, display: _X11Display, name: bytes, only_if_exists: bool = True
-) -> int:
-    """Call xlib's XInternAtom function."""
-    xlib.XInternAtom.argtypes = [
-        ctypes.POINTER(_X11DisplayStruct),  # Display
-        ctypes.c_char_p,  # Atom name
-        ctypes.c_int,  # Only if exists (bool)
-    ]
-    xlib.XInternAtom.restype = ctypes.c_ulong
-
-    atom = xlib.XInternAtom(display, name, only_if_exists)
-    if atom == 0:
-        raise Error(f"Failed to intern atom: {name!r}")
-
-    return atom
-
-
-@contextlib.contextmanager
-def _x11_get_window_property(
-    xlib: ctypes.CDLL,
-    display: _X11Display,
-    *,
-    window: _X11Window,
-    prop: int,
-    req_type: int,
-    length: int,
-    offset: int = 0,
-    delete: bool = False,
-) -> Iterator[tuple["ctypes._Pointer[ctypes.c_ubyte]", ctypes.c_ulong]]:
-    """Call xlib's XGetWindowProperty function."""
-    ret_actual_type = ctypes.c_ulong()
-    ret_actual_format = ctypes.c_int()
-    ret_nitems = ctypes.c_ulong()
-    ret_bytes_after = ctypes.c_ulong()
-    ret_prop = ctypes.POINTER(ctypes.c_ubyte)()
-
-    xlib.XGetWindowProperty.argtypes = [
-        ctypes.POINTER(_X11DisplayStruct),  # Display
-        ctypes.c_ulong,  # Window
-        ctypes.c_ulong,  # Property
-        ctypes.c_long,  # Offset
-        ctypes.c_long,  # Length
-        ctypes.c_int,  # Delete (bool)
-        ctypes.c_ulong,  # Required type (Atom)
-        ctypes.POINTER(ctypes.c_ulong),  # return: Actual type (Atom)
-        ctypes.POINTER(ctypes.c_int),  # return: Actual format
-        ctypes.POINTER(ctypes.c_ulong),  # return: Number of items
-        ctypes.POINTER(ctypes.c_ulong),  # return: Bytes after
-        ctypes.POINTER(ctypes.POINTER(ctypes.c_ubyte)),  # return: Property value
-    ]
-    xlib.XGetWindowProperty.restype = ctypes.c_int
-
-    result = xlib.XGetWindowProperty(
-        display,
-        window,
-        prop,
-        offset,
-        length,
-        delete,
-        req_type,
-        ctypes.byref(ret_actual_type),
-        ctypes.byref(ret_actual_format),
-        ctypes.byref(ret_nitems),
-        ctypes.byref(ret_bytes_after),
-        ctypes.byref(ret_prop),
-    )
-    if result != 0:
-        raise Error(f"XGetWindowProperty for {prop} failed: {result}")
-    if not ret_prop:
-        raise Error(f"Property {prop} is NULL")
-    if ret_actual_type.value != req_type:
-        raise Error(
-            f"Expected type {req_type}, got {ret_actual_type.value} for property {prop}"
-        )
-    if ret_bytes_after.value != 0:
-        raise Error(
-            f"Expected no bytes after property {prop}, got {ret_bytes_after.value}"
-        )
-
-    try:
-        yield ret_prop, ret_nitems
-    finally:
-        xlib.XFree(ret_prop)
-
-
-def _x11_get_wm_window(
-    xlib: ctypes.CDLL, display: _X11Display, *, atoms: _X11Atoms
-) -> _X11Window:
-    """Get the _NET_SUPPORTING_WM_CHECK window."""
-    xlib.XDefaultScreen.argtypes = [ctypes.POINTER(_X11DisplayStruct)]
-    xlib.XDefaultScreen.restype = ctypes.c_int
-
-    xlib.XRootWindow.argtypes = [
-        ctypes.POINTER(_X11DisplayStruct),  # Display
-        ctypes.c_int,  # Screen number
-    ]
-    xlib.XRootWindow.restype = ctypes.c_ulong
-
-    screen = xlib.XDefaultScreen(display)
-    root_window = xlib.XRootWindow(display, screen)
-
-    with _x11_get_window_property(
-        xlib,
-        display,
-        window=root_window,
-        prop=atoms.NET_SUPPORTING_WM_CHECK,
-        req_type=33,  # XA_WINDOW
-        length=1,
-    ) as (prop, _nitems):
-        win = ctypes.cast(prop, ctypes.POINTER(ctypes.c_ulong)).contents.value
-        return _X11Window(win)
-
-
-def _x11_get_wm_name(
-    xlib: ctypes.CDLL,
-    display: _X11Display,
-    *,
-    atoms: _X11Atoms,
-    wm_window: _X11Window,
-) -> str:
-    """Get the _NET_WM_NAME property of the window manager."""
-    with _x11_get_window_property(
-        xlib,
-        display,
-        window=wm_window,
-        prop=atoms.NET_WM_NAME,
-        req_type=atoms.UTF8_STRING,
-        length=1024,  # somewhat arbitrary
-    ) as (prop, nitems):
-        if nitems.value <= 0:
-            raise Error(f"{nitems.value} items found in _NET_WM_NAME property")
-        wm_name = ctypes.string_at(prop, nitems.value).decode("utf-8")
-        if not wm_name:
-            raise Error("Window manager name is empty")
-        return wm_name
-
-
-def x11_wm_name() -> str:
-    """Get the name of the running X11 window manager."""
-    xlib = _load_library("X11")
-    with _x11_open_display(xlib) as display:
-        atoms = _X11Atoms(
-            NET_SUPPORTING_WM_CHECK=_x11_intern_atom(
-                xlib, display, b"_NET_SUPPORTING_WM_CHECK"
-            ),
-            NET_WM_NAME=_x11_intern_atom(xlib, display, b"_NET_WM_NAME"),
-            UTF8_STRING=_x11_intern_atom(xlib, display, b"UTF8_STRING"),
-        )
-        wm_window = _x11_get_wm_window(xlib, display, atoms=atoms)
-        return _x11_get_wm_name(xlib, display, atoms=atoms, wm_window=wm_window)
-
-
-if __name__ == "__main__":
-    try:
-        wayland_name = wayland_compositor_name()
-        print(f"Wayland compositor name: {wayland_name}")
-    except Error as e:
-        print(f"Wayland error: {e}")
-
-    try:
-        x11_name = x11_wm_name()
-        print(f"X11 window manager name: {x11_name}")
-    except Error as e:
-        print(f"X11 error: {e}")

qutebrowser/utils/version.py

@@ -44,7 +44,7 @@ except ImportError:  # pragma: no cover
 import qutebrowser
 from qutebrowser.utils import (log, utils, standarddir, usertypes, message, resources,
                                qtutils)
-from qutebrowser.misc import objects, earlyinit, sql, httpclient, pastebin, elf, wmname
+from qutebrowser.misc import objects, earlyinit, sql, httpclient, pastebin, elf
 from qutebrowser.browser import pdfjs
 from qutebrowser.config import config
 if TYPE_CHECKING:
@@ -322,8 +322,8 @@ class ModuleInfo:
         except (ImportError, ValueError):
             self._installed = False
             return
-
-        self._installed = True
+        else:
+            self._installed = True
 
         for attribute_name in self._version_attributes:
             if hasattr(module, attribute_name):
@@ -332,13 +332,6 @@ class ModuleInfo:
                 self._version = str(version)
                 break
 
-        if self._version is None:
-            try:
-                self._version = importlib.metadata.version(self.name)
-            except importlib.metadata.PackageNotFoundError:
-                log.misc.debug(f"{self.name} not found")
-                self._version = None
-
         self._initialized = True
 
     def get_version(self) -> Optional[str]:
@@ -379,7 +372,7 @@ class ModuleInfo:
 
         version = self.get_version()
         if version is None:
-            return f'{self.name}: unknown'
+            return f'{self.name}: yes'
 
         text = f'{self.name}: {version}'
         if self.is_outdated():
@@ -390,7 +383,7 @@ class ModuleInfo:
 def _create_module_info() -> dict[str, ModuleInfo]:
     packages = [
         ('colorama', ['VERSION', '__version__']),
-        ('jinja2', []),
+        ('jinja2', ['__version__']),
         ('pygments', ['__version__']),
         ('yaml', ['__version__']),
         ('adblock', ['__version__'], "0.3.2"),
@@ -559,7 +552,6 @@ class WebEngineVersions:
         118: '118.0.5993.220',  # 2024-01-25, Qt 6.7
         122: '122.0.6261.171',  # 2024-04-15, Qt 6.8
         130: '130.0.6723.192',  # 2025-01-06, Qt 6.9
-        134: '134.0.6998.208',  # 2025-04-16, Qt 6.10
     }
 
     # Dates based on https://chromereleases.googleblog.com/
@@ -653,12 +645,6 @@ class WebEngineVersions:
         ## Qt 6.9
         utils.VersionNumber(6, 9): (_BASES[130], '133.0.6943.141'),  # 2025-02-25
         utils.VersionNumber(6, 9, 1): (_BASES[130], '136.0.7103.114'),  # 2025-05-13
-        utils.VersionNumber(6, 9, 2): (_BASES[130], '139.0.7258.67'),  # 2025-07-29
-        utils.VersionNumber(6, 9, 3): (_BASES[130], '140.0.7339.207'),  # 2025-09-22
-
-        ## 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:
@@ -927,51 +913,6 @@ def _backend() -> str:
     raise utils.Unreachable(objects.backend)
 
 
-def _webengine_extensions() -> Sequence[str]:
-    """Get a list of WebExtensions enabled in QtWebEngine."""
-    lines: list[str] = []
-    if (
-        objects.backend == usertypes.Backend.QtWebEngine
-        and machinery.IS_QT6  # mypy; TODO early return once Qt 5 is dropped
-    ):
-        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()
-        except AttributeError:
-            # Added in QtWebEngine 6.10
-            return []
-        assert ext_manager is not None  # mypy
-
-        if not ext_manager.extensions():
-            lines[0] += " none"
-
-        for info in ext_manager.extensions():
-            tags = [
-                ("[x]" if info.isEnabled() else "[ ]") + " enabled",
-                ("[x]" if info.isLoaded() else "[ ]") + " loaded",
-                ("[x]" if info.isInstalled() else "[ ]") + " installed",
-            ]
-            lines.append(f"  {info.name()} ({info.id()})")
-            lines.append(f"  {'  '.join(tags)}")
-            lines.append(f"  {info.path()}")
-            url = info.actionPopupUrl()
-            if url.isValid():
-                lines.append(f"  {url.toDisplayString()}")
-            lines.append("")
-
-    return lines
-
-
 def _uptime() -> datetime.timedelta:
     time_delta = datetime.datetime.now() - objects.qapp.launch_time
     # Round off microseconds
@@ -1021,15 +962,13 @@ def version_info() -> str:
                                      if QSslSocket.supportsSsl() else 'no'),
     ]
 
-    lines += _webengine_extensions()
-
     if objects.qapp:
         style = objects.qapp.style()
         assert style is not None
         metaobj = style.metaObject()
         assert metaobj is not None
         lines.append('Style: {}'.format(metaobj.className()))
-        lines.append('Qt Platform: {}'.format(gui_platform_info()))
+        lines.append('Platform plugin: {}'.format(objects.qapp.platformName()))
         lines.append('OpenGL: {}'.format(opengl_info()))
 
     importpath = os.path.dirname(os.path.abspath(qutebrowser.__file__))
@@ -1198,19 +1137,6 @@ def opengl_info() -> Optional[OpenGLInfo]:  # pragma: no cover
             old_context.makeCurrent(old_surface)
 
 
-def gui_platform_info() -> str:
-    """Get the Qt GUI platform name, optionally with the WM/compositor name."""
-    info = objects.qapp.platformName()
-    try:
-        if info == "xcb":
-            info += f" ({wmname.x11_wm_name()})"
-        elif info in ["wayland", "wayland-egl"]:
-            info += f" ({wmname.wayland_compositor_name()})"
-    except wmname.Error as e:
-        info += f" (Error: {e})"
-    return info
-
-
 def pastebin_version(pbclient: pastebin.PastebinClient = None) -> None:
     """Pastebin the version and log the url to messages."""
     def _yank_url(url: str) -> None:

requirements.txt

@@ -3,9 +3,9 @@
 adblock==0.6.0
 colorama==0.4.6
 Jinja2==3.1.6
-MarkupSafe==3.0.3
-Pygments==2.19.2
-PyYAML==6.0.3
+MarkupSafe==3.0.2
+Pygments==2.19.1
+PyYAML==6.0.2
 # Unpinned due to recompile_requirements.py limitations
 pyobjc-core ; sys_platform=="darwin"
 pyobjc-framework-Cocoa ; sys_platform=="darwin"

scripts/dev/build_release.py

@@ -6,7 +6,6 @@
 
 """Build a new release."""
 
-from __future__ import annotations
 
 import os
 import sys
@@ -21,8 +20,7 @@ import platform
 import collections
 import dataclasses
 import re
-import http
-from typing import Optional, TYPE_CHECKING
+from typing import Optional
 from collections.abc import Iterable
 
 try:
@@ -30,12 +28,6 @@ try:
 except ImportError:
     pass
 
-if TYPE_CHECKING:
-    import github3
-    import github3.repos.release
-
-import requests
-
 REPO_ROOT = pathlib.Path(__file__).resolve().parents[2]
 sys.path.insert(0, str(REPO_ROOT))
 
@@ -134,7 +126,7 @@ def _smoke_test_run(
     return subprocess.run(argv, check=True, capture_output=True)
 
 
-def smoke_test(executable: pathlib.Path, debug_build: bool) -> None:
+def smoke_test(executable: pathlib.Path, debug: bool) -> None:
     """Try starting the given qutebrowser executable."""
     stdout_whitelist = []
     stderr_whitelist = [
@@ -184,10 +176,6 @@ def smoke_test(executable: pathlib.Path, debug_build: bool) -> None:
 
             # Qt 6.9 on macOS
             r'Compositor returned null texture',
-
-            # Qt 6.10
-            (r'\[.*:ERROR:service_utils.cc\([0-9]*\)\] '
-             r'Skia Graphite backend = "" not found - falling back to Ganesh!'),
         ])
     elif IS_WINDOWS:
         stderr_whitelist.extend([
@@ -196,27 +184,10 @@ def smoke_test(executable: pathlib.Path, debug_build: bool) -> None:
             (r'\[.*:ERROR:dxva_video_decode_accelerator_win.cc\(\d+\)\] '
             r'DXVAVDA fatal error: could not LoadLibrary: .*: The specified '
             r'module could not be found. \(0x7E\)'),
-            # Qt 6.10
-            (r'\[.*:ERROR:direct_composition_support.cc\([0-9]*\)\] '
-             r'GetGpuDriverOverlayInfo: Failed to retrieve video device'),
-            (r'\[.*:ERROR:direct_composition_support.cc\([0-9]*\)\] QueryInterface '
-             r'to IDCompositionDevice4 failed: No such interface supported '
-             r'\(0x80004002\)'),
         ])
 
-    try:
-        proc = _smoke_test_run(executable)
-    except subprocess.CalledProcessError as e:
-        print(f"Smoke test failed: {e}, running with --debug")
-        smoke_test_debug(
-            executable,
-            original_stdout=e.stdout.decode("utf-8"),
-            original_stderr=e.stderr.decode("utf-8"),
-            issue_description=str(e),
-        )
-        return
-
-    if debug_build:
+    proc = _smoke_test_run(executable)
+    if debug:
         print("Skipping output check for debug build")
         return
 
@@ -225,64 +196,48 @@ def smoke_test(executable: pathlib.Path, debug_build: bool) -> None:
 
     if stdout or stderr:
         print("Unexpected output, running with --debug")
-        smoke_test_debug(
-            executable,
-            original_stdout=stdout,
-            original_stderr=stderr,
-            issue_description="Unexpected output",
-        )
+        proc = _smoke_test_run(executable, '--debug')
+        debug_stdout = proc.stdout.decode('utf-8')
+        debug_stderr = proc.stderr.decode('utf-8')
 
-
-def smoke_test_debug(
-    executable: pathlib.Path,
-    *,
-    original_stdout: str,
-    original_stderr: str,
-    issue_description: str,
-) -> None:
-    """Run smoke test in debug mode to get more output."""
-    proc = _smoke_test_run(executable, '--debug')
-    debug_stdout = proc.stdout.decode('utf-8')
-    debug_stderr = proc.stderr.decode('utf-8')
-
-    lines = [
-        issue_description,
-        "",
-    ]
-    if original_stdout:
-        lines += [
-            "stdout",
-            "------",
-            "",
-            original_stdout,
-            "",
-        ]
-    if original_stderr:
-        lines += [
-            "stderr",
-            "------",
-            "",
-            original_stderr,
-            "",
-        ]
-    if debug_stdout:
-        lines += [
-            "debug rerun stdout",
-            "------------------",
-            "",
-            debug_stdout,
-            "",
-        ]
-    if debug_stderr:
-        lines += [
-            "debug rerun stderr",
-            "------------------",
-            "",
-            debug_stderr,
+        lines = [
+            "Unexpected output!",
             "",
         ]
+        if stdout:
+            lines += [
+                "stdout",
+                "------",
+                "",
+                stdout,
+                "",
+            ]
+        if stderr:
+            lines += [
+                "stderr",
+                "------",
+                "",
+                stderr,
+                "",
+            ]
+        if debug_stdout:
+            lines += [
+                "debug rerun stdout",
+                "------------------",
+                "",
+                debug_stdout,
+                "",
+            ]
+        if debug_stderr:
+            lines += [
+                "debug rerun stderr",
+                "------------------",
+                "",
+                debug_stderr,
+                "",
+            ]
 
-    raise Exception("\n".join(lines))  # pylint: disable=broad-exception-raised
+        raise Exception("\n".join(lines))  # pylint: disable=broad-exception-raised
 
 
 def verify_windows_exe(exe_path: pathlib.Path) -> None:
@@ -338,7 +293,7 @@ def build_mac(
     dist_path = pathlib.Path("dist")
 
     utils.print_title("Running pre-dmg smoke test")
-    smoke_test(_mac_bin_path(dist_path), debug_build=debug)
+    smoke_test(_mac_bin_path(dist_path), debug=debug)
 
     if skip_packaging:
         return []
@@ -361,7 +316,7 @@ def build_mac(
             subprocess.run(['hdiutil', 'attach', dmg_path,
                             '-mountpoint', tmp_path], check=True)
             try:
-                smoke_test(_mac_bin_path(tmp_path), debug_build=debug)
+                smoke_test(_mac_bin_path(tmp_path), debug=debug)
             finally:
                 print("Waiting 10s for dmg to be detachable...")
                 time.sleep(10)
@@ -420,7 +375,7 @@ def _build_windows_single(
     verify_windows_exe(exe_path)
 
     utils.print_title("Running smoke test")
-    smoke_test(exe_path, debug_build=debug)
+    smoke_test(exe_path, debug=debug)
 
     if skip_packaging:
         return []
@@ -596,36 +551,11 @@ def read_github_token(
     return token
 
 
-def _github_find_release(
-    gh: github3.GitHub, tag: str, experimental: bool
-) -> github3.repos.release.Release:
-    if experimental:
-        repo = gh.repository('qutebrowser', 'experiments')
-    else:
-        repo = gh.repository('qutebrowser', 'qutebrowser')
-    assert repo is not None
-
-    for release in repo.releases():
-        if release.tag_name == tag:
-            return release
-
-    releases = ", ".join(r.tag_name for r in repo.releases())
-    raise Exception(  # pylint: disable=broad-exception-raised
-        f"No release found for {tag!r} in {repo.full_name}, found: {releases}")
-
-
-def _github_assets(
-    release: github3.repos.release.Release, artifact: Artifact
-) -> list[github3.repos.release.Asset]:
-    return [asset for asset in release.assets() if asset.name == artifact.path.name]
-
-
 def github_upload(
     artifacts: list[Artifact],
     tag: str,
     gh_token: str,
     experimental: bool,
-    skip_if_exists: bool,
 ) -> None:
     """Upload the given artifacts to GitHub.
 
@@ -634,25 +564,35 @@ def github_upload(
         tag: The name of the release tag
         gh_token: The GitHub token to use
         experimental: Upload to the experiments repo
-        skip_if_exists: Skip uploading artifacts that already exist
     """
+    # pylint: disable=broad-exception-raised
     import github3
     import github3.exceptions
     utils.print_title("Uploading to github...")
 
     gh = github3.login(token=gh_token)
-    assert gh is not None
-    release = _github_find_release(gh=gh, tag=tag, experimental=experimental)
+
+    if experimental:
+        repo = gh.repository('qutebrowser', 'experiments')
+    else:
+        repo = gh.repository('qutebrowser', 'qutebrowser')
+
+    release = None  # to satisfy pylint
+    for release in repo.releases():
+        if release.tag_name == tag:
+            break
+    else:
+        releases = ", ".join(r.tag_name for r in repo.releases())
+        raise Exception(
+            f"No release found for {tag!r} in {repo.full_name}, found: {releases}")
 
     for artifact in artifacts:
-        if _github_assets(release, artifact) and skip_if_exists:
-            print(f"Artifact {artifact.path.name} already exists, skipping")
-            continue
-
         while True:
             print(f"Uploading {artifact.path}")
 
-            if (assets := _github_assets(release, artifact)):
+            assets = [asset for asset in release.assets()
+                      if asset.name == artifact.path.name]
+            if assets:
                 print(f"Assets already exist: {assets}")
 
                 if utils.ON_CI:
@@ -680,7 +620,9 @@ def github_upload(
 
                 print("Retrying!")
 
-                if (assets := _github_assets(release, artifact)):
+                assets = [asset for asset in release.assets()
+                          if asset.name == artifact.path.name]
+                if assets:
                     stray_asset = assets[0]
                     print(f"Deleting stray asset {stray_asset.name}")
                     stray_asset.delete()
@@ -688,29 +630,12 @@ def github_upload(
                 break
 
 
-def check_pypi_exists(version: str) -> bool:
-    """Check whether the given version exists on PyPI."""
-    response = requests.get(
-        f"https://pypi.org/pypi/qutebrowser/{version}/json", timeout=30
-    )
-    if response.status_code == http.HTTPStatus.NOT_FOUND:
-        return False
-    response.raise_for_status()
-    return bool(response.json()["urls"])
-
-
-def pypi_upload(
-    artifacts: list[Artifact], experimental: bool, skip_if_exists: bool
-) -> None:
+def pypi_upload(artifacts: list[Artifact], experimental: bool) -> None:
     """Upload the given artifacts to PyPI using twine."""
-    utils.print_title("Uploading to PyPI...")
-    if skip_if_exists and check_pypi_exists(qutebrowser.__version__):
-        print(f"Version {qutebrowser.__version__} already exists on PyPI, skipping")
-        return
-
     # https://blog.pypi.org/posts/2023-05-23-removing-pgp/
     artifacts = [a for a in artifacts if a.mimetype != 'application/pgp-signature']
 
+    utils.print_title("Uploading to PyPI...")
     if experimental:
         run_twine('upload', artifacts, "-r", "testpypi")
     else:
@@ -736,8 +661,6 @@ def main() -> None:
                         nargs='?')
     parser.add_argument('--upload', action='store_true', required=False,
                         help="Toggle to upload the release to GitHub.")
-    parser.add_argument('--reupload', action='store_true', required=False,
-                        help="Skip uploading artifacts that already exist.")
     parser.add_argument('--no-confirm', action='store_true', required=False,
                         help="Skip confirmation before uploading.")
     parser.add_argument('--skip-packaging', action='store_true', required=False,
@@ -797,16 +720,9 @@ def main() -> None:
 
         assert gh_token is not None
         github_upload(
-            artifacts,
-            version_tag,
-            gh_token=gh_token,
-            experimental=args.experimental,
-            skip_if_exists=args.reupload,
-        )
+            artifacts, version_tag, gh_token=gh_token, experimental=args.experimental)
         if upload_to_pypi:
-            pypi_upload(
-                artifacts, experimental=args.experimental, skip_if_exists=args.reupload
-            )
+            pypi_upload(artifacts, experimental=args.experimental)
     else:
         print()
         utils.print_title("Artifacts")

scripts/dev/changelog_urls.json

@@ -23,7 +23,6 @@
   "Mako": "https://docs.makotemplates.org/en/latest/changelog.html",
   "hypothesis": "https://hypothesis.readthedocs.io/en/latest/changes.html",
   "mypy": "https://github.com/python/mypy/blob/master/CHANGELOG.md",
-  "librt": "https://github.com/mypyc/librt/commits/master/",
   "types-PyYAML": "https://github.com/python/typeshed/commits/main/stubs/PyYAML",
   "types-colorama": "https://github.com/python/typeshed/commits/main/stubs/colorama",
   "types-docutils": "https://github.com/python/typeshed/commits/main/stubs/docutils",
@@ -102,6 +101,7 @@
   "h11": "https://h11.readthedocs.io/en/latest/changes.html",
   "httpcore": "https://github.com/encode/httpcore/blob/master/CHANGELOG.md",
   "httpx": "https://github.com/encode/httpx/blob/master/CHANGELOG.md",
+  "sniffio": "https://sniffio.readthedocs.io/en/latest/history.html",
   "six": "https://github.com/benjaminp/six/blob/master/CHANGES",
   "altgraph": "https://github.com/ronaldoussoren/altgraph/blob/master/doc/changelog.rst",
   "urllib3": "https://github.com/urllib3/urllib3/blob/main/CHANGES.rst",
@@ -127,7 +127,7 @@
   "distlib": "https://github.com/pypa/distlib/blob/master/CHANGES.rst",
   "py-cpuinfo": "https://github.com/workhorsy/py-cpuinfo/blob/master/ChangeLog",
   "cheroot": "https://cheroot.cherrypy.dev/en/latest/history.html",
-  "certifi": "https://ccadb.my.salesforce-sites.com/mozilla/IncludedCACertificateReport",
+  "certifi": "https://ccadb-public.secure.force.com/mozilla/IncludedCACertificateReport",
   "chardet": "https://github.com/chardet/chardet/releases",
   "charset-normalizer": "https://github.com/Ousret/charset_normalizer/blob/master/CHANGELOG.md",
   "idna": "https://github.com/kjd/idna/blob/master/HISTORY.rst",

scripts/dev/ci/docker/Dockerfile.j2

@@ -10,12 +10,21 @@ RUN pacman -Su --noconfirm \
     python-tox \
     python-distlib \
     libxml2-legacy \
-    qt6-base \
-    qt6-declarative \
-    qt6-webengine \
-    python-pyqt6-webengine \
-    pdfjs \
-    python-pyqt6 \
+    {% if qt6 %}
+      qt6-base \
+      qt6-declarative \
+      qt6-webengine \
+      python-pyqt6-webengine \
+      pdfjs \
+      python-pyqt6 \
+    {% else %}
+      qt5-base \
+      qt5-declarative \
+      openssl-1.1 \
+      qt5-webengine \
+      python-pyqtwebengine \
+      python-pyqt5 \
+    {% endif %}
     xorg-xinit \
     xorg-server-xvfb \
     ttf-bitstream-vera \
@@ -27,7 +36,12 @@ RUN useradd user -u 1001 && \
     mkdir /home/user && \
     chown user:users /home/user
 
-RUN python3 -c "from PyQt6 import QtWebEngineCore, QtWebEngineWidgets"
+{% if qt6 %}
+  {% set pyqt_module = 'PyQt6' %}
+{% else %}
+  {% set pyqt_module = 'PyQt5' %}
+{% endif %}
+RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
 
 USER user
 WORKDIR /home/user
@@ -35,4 +49,4 @@ RUN git config --global --add safe.directory /outside/.git
 
 CMD git clone /outside qutebrowser.git && \
     cd qutebrowser.git && \
-    {{ python }} -m tox -e py-qt6
+    {{ python }} -m tox -e {% if qt6 %}py-qt6{% else %}py-qt5{% endif %}

scripts/dev/ci/docker/generate.py

@@ -7,14 +7,17 @@
 
 """Generate Dockerfiles for qutebrowser's CI."""
 
+import sys
 import argparse
 
 import jinja2
 
 
 CONFIGS = {
-    'archlinux-webengine': {'unstable': False},
-    'archlinux-webengine-unstable': {'unstable': True},
+    'archlinux-webengine': {'unstable': False, 'qt6': False},
+    'archlinux-webengine-qt6': {'unstable': False, 'qt6': True},
+    'archlinux-webengine-unstable': {'unstable': True, 'qt6': False},
+    'archlinux-webengine-unstable-qt6': {'unstable': True, 'qt6': True},
 }
 
 

scripts/dev/update_version.py

@@ -54,14 +54,13 @@ def show_commit():
     git_args = ['git', 'show']
     if utils.ON_CI:
         git_args.append("--color")
-        git_args.append("--no-patch")  # shows entire git tree on CI (shallow clone)
     subprocess.run(git_args, check=True)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Update release version.")
     parser.add_argument('bump', action="store",
-                        choices=["major", "minor", "patch", "reupload"],
+                        choices=["major", "minor", "patch"],
                         help="Update release version")
     parser.add_argument('--commands', action="store_true",
                         help="Only show commands to run post-release.")
@@ -71,8 +70,7 @@ if __name__ == "__main__":
 
     if not args.commands:
         verify_branch(args.bump)
-        if args.bump != "reupload":
-            bump_version(args.bump)
+        bump_version(args.bump)
         show_commit()
 
     import qutebrowser
@@ -89,16 +87,15 @@ if __name__ == "__main__":
         print(f"Outputs for {version} written to GitHub Actions output file")
     else:
         print("Run the following commands to create a new release:")
-        if args.bump != 'reupload':
-            print("* git push origin; git push origin v{v}".format(v=version))
-            if args.bump == 'patch':
-                print("* git checkout main && git cherry-pick -x v{v} && "
-                    "git push origin".format(v=version))
-            else:
-                print("* git branch v{x} v{v} && git push --set-upstream origin v{x}"
-                    .format(v=version, x=version_x))
-            print("* Create new release via GitHub (required to upload release "
-                "artifacts)")
+        print("* git push origin; git push origin v{v}".format(v=version))
+        if args.bump == 'patch':
+            print("* git checkout main && git cherry-pick -x v{v} && "
+                "git push origin".format(v=version))
+        else:
+            print("* git branch v{x} v{v} && git push --set-upstream origin v{x}"
+                .format(v=version, x=version_x))
+        print("* Create new release via GitHub (required to upload release "
+            "artifacts)")
         print("* Linux: git fetch && git checkout v{v} && "
             "tox -e build-release -- --upload"
             .format(v=version))

scripts/link_pyqt.py

@@ -107,7 +107,7 @@ def get_lib_path(executable, name, required=True):
         return data
     elif prefix == 'ImportError':
         if required:
-            wrapper = os.environ.get("QUTE_QT_WRAPPER", "unset")
+            wrapper = os.environ["QUTE_QT_WRAPPER"]
             raise Error(
                 f"Could not import {name} with {executable}: {data} "
                 f"(QUTE_QT_WRAPPER: {wrapper})"

scripts/mkvenv.py

@@ -453,6 +453,7 @@ def install_dev_requirements(venv_dir: pathlib.Path) -> None:
     utils.print_title("Installing dev dependencies")
     pip_install(venv_dir,
                 '-r', str(requirements_file('dev')),
+                '-r', str(requirements_file('check-manifest')),
                 '-r', str(requirements_file('flake8')),
                 '-r', str(requirements_file('mypy')),
                 '-r', str(requirements_file('pyroma')),

setup.py

@@ -9,15 +9,7 @@
 import re
 import ast
 import os
-import sys
-import pathlib
-
-# Add repo root to path so we can import scripts. Prior to PEP517 support this
-# was the default behavior for setuptools.
-# https://github.com/pypa/setuptools/issues/3939#issuecomment-1573619382
-# > If users want to import local modules they are recommended to explicitly add
-# > the current directory to sys.path at the top of setup.py.
-sys.path.append(".")
+import os.path
 
 from scripts import setupcommon as common
 
@@ -25,7 +17,7 @@ import setuptools
 
 
 try:
-    BASEDIR = pathlib.Path(__file__).resolve().parent
+    BASEDIR = os.path.dirname(os.path.realpath(__file__))
 except NameError:
     BASEDIR = None
 
@@ -50,8 +42,8 @@ def _get_constant(name):
         The value of the argument.
     """
     field_re = re.compile(r'__{}__\s+=\s+(.*)'.format(re.escape(name)))
-    init_path = BASEDIR / 'qutebrowser' / '__init__.py'
-    line = field_re.search(read_file(init_path)).group(1)
+    path = os.path.join(BASEDIR, 'qutebrowser', '__init__.py')
+    line = field_re.search(read_file(path)).group(1)
     value = ast.literal_eval(line)
     return value
 
@@ -99,6 +91,6 @@ try:
     )
 finally:
     if BASEDIR is not None:
-        git_commit_id_path = BASEDIR / 'qutebrowser' / 'git-commit-id'
-        if git_commit_id_path.exists():
-            git_commit_id_path.unlink()
+        path = os.path.join(BASEDIR, 'qutebrowser', 'git-commit-id')
+        if os.path.exists(path):
+            os.remove(path)

tests/conftest.py

@@ -132,10 +132,10 @@ def _apply_platform_markers(config, item):
             (
                 config.webengine
                 and version.qtwebengine_versions(avoid_init=True).webengine
-                > utils.VersionNumber(6, 9)
+                == utils.VersionNumber(6, 9)
                 and testutils.ON_CI
             ),
-            "Flaky with QtWebEngine 6.9+ on CI",
+            "Flaky with QtWebEngine 6.9 on CI",
         ),
         (
             "qt69_ci_skip",  # WORKAROUND: https://github.com/qutebrowser/qutebrowser/issues/8444#issuecomment-2569610110
@@ -143,10 +143,10 @@ def _apply_platform_markers(config, item):
             (
                 config.webengine
                 and version.qtwebengine_versions(avoid_init=True).webengine
-                > utils.VersionNumber(6, 9)
+                == utils.VersionNumber(6, 9)
                 and testutils.ON_CI
             ),
-            "Skipped with QtWebEngine 6.9+ on CI",
+            "Skipped with QtWebEngine 6.9 on CI",
         ),
     ]
 

tests/end2end/data/hints/html/shadow_dom.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-
-<!-- target: hello.txt -->
-
-<html>
-    <body>
-    <div id="host"></div>
-    <script>
-        const hostElement = document.getElementById('host');
-        const shadowRoot = hostElement.attachShadow({ mode: 'open' });
-        const a = document.createElement('a');
-        a.href = '/data/hello.txt';
-        a.textContent = 'In shadow DOM';
-        shadowRoot.appendChild(a);
-    </script>
-    </body>
-</html>

tests/end2end/data/scroll/position_absolute.html

@@ -3,7 +3,6 @@
     <head>
         <meta charset="utf-8">
         <title>Scrolling</title>
-        <script>requestAnimationFrame(() => console.log('position_absolute loaded'))</script>
     </head>
     <body style="position: absolute">
       <a href="/data/hello.txt" id="link">Just a link</a>

tests/end2end/data/scroll/simple.html

@@ -15,11 +15,9 @@
                     console.log("[PASS] Positions equal: " + old_position);
                 }
             }
-
-            requestAnimationFrame(() => console.log('simple loaded'))
         </script>
     </head>
-    <body>
+    <body onload="console.log('simple loaded')">
       <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/completion.feature

@@ -103,11 +103,3 @@ Feature: Using completion
         And I run :completion-item-focus next
         And I run :cmd-set-text -s :set
         Then the completion model should be option
-
-    Scenario: Page focus after using completion (#8750)
-        When I open data/insert_mode_settings/html/input.html
-        And I run :cmd-set-text :
-        And I run :mode-leave
-        And I run :click-element id qute-input
-        And I run :fake-key -g someinput
-        Then the javascript message "contents: someinput" should be logged

tests/end2end/features/conftest.py

@@ -417,7 +417,7 @@ def update_documentation():
     try:
         subprocess.run(['asciidoc'], stdout=subprocess.DEVNULL,
                        stderr=subprocess.DEVNULL, check=True)
-    except (OSError, subprocess.CalledProcessError):
+    except OSError:
         pytest.skip("Docs outdated and asciidoc unavailable!")
 
     update_script = os.path.join(script_path, 'asciidoc2html.py')

tests/end2end/features/downloads.feature

@@ -78,8 +78,8 @@ Feature: Downloading things from a website.
         And I open data/downloads/issue1243.html
         And I hint with args "links download" and follow a
         And I wait for "Asking question <qutebrowser.utils.usertypes.Question default='qutebrowser-download' mode=<PromptMode.download: 5> option=None text=* title='Save file to:'>, *" in the log
-        Then the error "Download error: Invalid host (from path): ''" should be shown
-        And "UrlInvalidError while handling qute://* URL" should be logged
+        Then the error "Download error: No handler found for qute://" should be shown
+        And "NotFoundError while handling qute://* URL" should be logged
 
     Scenario: Downloading a data: link (issue 1214)
         When I set downloads.location.suggestion to filename
@@ -129,14 +129,6 @@ Feature: Downloading things from a website.
         And I wait for "Download drip finished" in the log
         Then the downloaded file drip should be 128 bytes big
 
-    Scenario: Shutting down with a download question
-        When I set downloads.location.prompt to true
-        And I open data/downloads/download.bin without waiting
-        And I wait for "Asking question <qutebrowser.utils.usertypes.Question default='*' mode=<PromptMode.download: 5> option=None text='Please enter a location for <b>http://localhost:*/data/downloads/download.bin</b>' title='Save file to:'>, *" in the log
-        And I run :close
-        Then qutebrowser should quit
-        # (and no crash should happen)
-
     Scenario: Downloading a file with spaces
         When I open data/downloads/download with spaces.bin without waiting
         And I wait until the download is finished
@@ -677,21 +669,6 @@ Feature: Downloading things from a website.
         Then the downloaded file download.bin should exist
         And the downloaded file download2.bin should not exist
 
-    @qt>=6.9
-    Scenario: Nested download prompts (#8674)
-        When I set downloads.location.prompt to true
-        And I open data/downloads/download.bin without waiting
-        And I wait for "Asking question <qutebrowser.utils.usertypes.Question default='*' mode=<PromptMode.download: 5> option=None text=* title='Save file to:'>, *" in the log
-        And I open data/downloads/download.bin without waiting
-        And I wait for "Asking question <qutebrowser.utils.usertypes.Question default='*' mode=<PromptMode.download: 5> option=None text=* title='Save file to:'>, *" in the log
-        And I open data/downloads/download.bin without waiting
-        And I wait for "Asking question <qutebrowser.utils.usertypes.Question default='*' mode=<PromptMode.download: 5> option=None text=* title='Save file to:'>, *" in the log
-        And I run :prompt-accept
-        And I run :mode-leave
-        And I run :mode-leave
-        And I wait until the download is finished
-        Then the downloaded file download.bin should exist
-
     @qtwebengine_skip  # We can't get the UA from the page there
     Scenario: user-agent when using :download
         When I open user-agent

tests/end2end/features/misc.feature

@@ -386,13 +386,6 @@ Feature: Various utility commands.
         And I run :jseval console.log(window.navigator.userAgent)
         Then the header User-Agent should be set to toaster
 
-    Scenario: User-agent header with redirect
-        When I run :set -u localhost content.headers.user_agent toaster
-        And I open redirect-to?url=headers without waiting
-        And I wait until headers is loaded
-        And I run :jseval console.log(window.navigator.userAgent)
-        Then the header User-Agent should be set to toaster
-
     Scenario: User-agent header (JS)
         When I set content.headers.user_agent to toaster
         And I open about:blank

tests/end2end/features/scroll.feature

@@ -327,7 +327,6 @@ Feature: Scrolling
 
     Scenario: Relative scroll position with a position:absolute page
         When I open data/scroll/position_absolute.html
-        And I wait for "* position_absolute loaded" in the log
         And I run :scroll-to-perc 100
         And I wait until the scroll position changed
         And I run :scroll-page --bottom-navigate next 0 1
@@ -340,11 +339,3 @@ Feature: Scrolling
         And I run :tab-next
         And I run :jseval --world main checkAnchor()
         Then "[*] [PASS] Positions equal: *" should be logged
-
-    Scenario: Showing/hiding statusbar (#2236, #8223)
-        When I set statusbar.show to never
-        And I run :scroll-to-perc 100
-        And I wait until the scroll position changed
-        And I run :cmd-set-text /
-        And I run :fake-key -g <Escape>
-        Then "Scroll position changed to Py*.QtCore.QPoint()" should not be logged

tests/end2end/features/sessions.feature

@@ -75,7 +75,6 @@ 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

@@ -49,14 +49,11 @@ def fresh_instance(quteproc):
     # Qt6.8 by default will remember feature grants or denies. When we are
     # on PyQt6.8 we disable that with the new API, otherwise restart the
     # browser to make it forget previous prompts.
-    #
-    # 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):
+    ):
         quteproc.terminate()
         quteproc.start()
 

tests/end2end/fixtures/quteprocess.py

@@ -239,7 +239,7 @@ def is_ignored_chromium_message(line):
         # Qt 6.7 on GitHub Actions
         # [3456:5752:1111/103609.929:ERROR:block_files.cc(443)] Failed to open
         # C:\Users\RUNNER~1\AppData\Local\Temp\qutebrowser-basedir-ruvn1lys\data\webengine\DawnCache\data_0
-        "Failed to open *webengine*Dawn*Cache*data_*",
+        "Failed to open *webengine*DawnCache*data_*",
 
         # Qt 6.8 on GitHub Actions
         # [7072:3412:1209/220659.527:ERROR:simple_index_file.cc(322)] Failed to
@@ -253,24 +253,6 @@ def is_ignored_chromium_message(line):
         # Qt 6.9 on GitHub Actions with Windows Server 2025
         # [4348:7828:0605/123815.402:ERROR:shared_image_manager.cc(356)]
         "SharedImageManager::ProduceMemory: Trying to Produce a Memory representation from a non-existent mailbox.",
-
-        # Qt 6.10 debug build
-        # "[453900:453973:0909/000324.265214:WARNING:viz_main_impl.cc(85)]"
-        "VizNullHypothesis is disabled (not a warning)",
-
-        # Qt 6.10 on Windows + GitHub Actions
-        # [1784:7100:1022/150433.690:ERROR:direct_composition_support.cc(225)]
-        "GetGpuDriverOverlayInfo: Failed to retrieve video device",
-        # [1784:7100:1022/150434.202:ERROR:direct_composition_support.cc(1122)]
-        "QueryInterface to IDCompositionDevice4 failed: No such interface supported (0x80004002)",
-
-        # Qt 6.10 on Windows + GitHub Actions
-        # [3508:6056:1103/172403.602:ERROR:cache_util_win.cc(20)]
-        "Unable to move the cache: The system cannot find the file specified. (0x2)",
-        # [3508:5516:1103/172403.608:ERROR:disk_cache.cc(216)]
-        "Unable to create cache",
-        # [3508:5516:1103/172403.608:ERROR:gpu_disk_cache.cc(711)]
-        "Gpu Cache Creation failed: -2",
     ]
     return any(testutils.pattern_match(pattern=pattern, value=message)
                for pattern in ignored_messages)

tests/end2end/fixtures/testprocess.py

@@ -398,7 +398,7 @@ class Process(QObject):
             match = self._wait_for_match(spy, kwargs)
             if match is not None:
                 if message is not None:
-                    self._log(f"----> found it: {match.formatted_str()}")
+                    self._log("----> found it")
                 return match
 
         raise quteutils.Unreachable

tests/end2end/test_invocations.py

@@ -21,7 +21,6 @@ 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
 
 
@@ -252,7 +251,6 @@ 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()
@@ -613,26 +611,6 @@ 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/api/test_cmdutils.py

@@ -8,7 +8,6 @@ import sys
 import logging
 import types
 import enum
-import inspect
 import textwrap
 
 import pytest
@@ -441,15 +440,7 @@ class TestArgument:
 
     def test_no_docstring_with_optimize(self, monkeypatch):
         """With -OO we'd get a warning on start, but no warning afterwards."""
-        sys_flags_fake = types.SimpleNamespace(
-            **{
-                k: v
-                for k, v in inspect.getmembers(sys.flags)
-                if not k.startswith("_") and k not in {"count", "index"}
-            }
-        )
-        sys_flags_fake.optimize = 2
-        monkeypatch.setattr(sys, 'flags', sys_flags_fake)
+        monkeypatch.setattr(sys, 'flags', types.SimpleNamespace(optimize=2))
 
         @cmdutils.register()
         def fun():

tests/unit/browser/test_hints.py

@@ -4,6 +4,7 @@
 
 import string
 import functools
+import itertools
 import operator
 
 import pytest
@@ -75,7 +76,7 @@ def test_match_benchmark(benchmark, tabbed_browser, qtbot, mode_manager, qapp,
 
 @pytest.mark.parametrize('min_len', [0, 3])
 @pytest.mark.parametrize('num_chars', [5, 9])
-@pytest.mark.parametrize('num_elements', [*range(1, 26), 125])
+@pytest.mark.parametrize('num_elements', itertools.chain(range(1, 26), [125]))
 def test_scattered_hints_count(min_len, num_chars, num_elements):
     """Test scattered hints function.
 

tests/unit/browser/test_qutescheme.py

@@ -17,36 +17,6 @@ from qutebrowser.utils import resources, urlmatch
 from qutebrowser.misc import guiprocess
 
 
-class TestDataForUrl:
-    @pytest.mark.parametrize(
-        "url, expected",
-        [
-            # QUrl.UrlFormattingOption.StripTrailingSlash
-            (QUrl("qute://abc/xyz/"), QUrl("qute://abc/xyz")),
-            # QUrl.UrlFormattingOption.NormalizePathSegments
-            (QUrl("qute://abc/uvw/../xyz"), QUrl("qute://abc/xyz")),
-            # Adding host trailing slash
-            (QUrl("qute://abc"), QUrl("qute://abc/")),
-            (QUrl("qute://abc?q=42"), QUrl("qute://abc/?q=42")),
-            # path -> host
-            (QUrl("qute:abc"), QUrl("qute://abc/")),
-            (QUrl("qute:abc?q=42"), QUrl("qute://abc/?q=42")),
-        ],
-        ids=lambda url: url.toString(),
-    )
-    def test_redirects(self, url: QUrl, expected: QUrl) -> None:
-        with pytest.raises(qutescheme.Redirect) as exc:
-            qutescheme.data_for_url(url)
-        assert exc.value.url == expected
-
-    def test_invalid_redirect(self) -> None:
-        url = QUrl("qute:-")
-        with pytest.raises(
-            qutescheme.UrlInvalidError, match=r"Invalid host \(from path\): '-'"
-        ):
-            qutescheme.data_for_url(url)
-
-
 class TestJavascriptHandler:
 
     """Test the qute://javascript endpoint."""

tests/unit/config/test_configcommands.py

@@ -315,10 +315,9 @@ class TestAdd:
         with pytest.raises(cmdutils.CommandError, match="Invalid value ''"):
             commands.config_list_add('content.blocking.whitelist', '')
 
-    def test_list_add_value_type(self, commands, config_stub):
-        commands.config_list_add("completion.web_history.exclude", "*")
-        value = config_stub.val.completion.web_history.exclude
-        assert value == [urlmatch.UrlPattern("*")]
+    # FIXME test value conversion for :list-add like in test_dict_add_value_type
+    # (once we have a List config option using a non-str type, or a way to
+    # dynamically add new option definitions).
 
     @pytest.mark.parametrize('value', ['test1', 'test2'])
     @pytest.mark.parametrize('temp', [True, False])
@@ -411,16 +410,9 @@ class TestRemove:
                 match="#133742 is not in colors.completion.fg!"):
             commands.config_list_remove('colors.completion.fg', '#133742')
 
-    def test_list_remove_value_type(self, commands, config_stub):
-        config_stub.val.completion.web_history.exclude = ["*"]
-        commands.config_list_remove("completion.web_history.exclude", "*")
-        assert not config_stub.val.completion.web_history.exclude
-
-    def test_list_remove_invalid_value(self, commands, config_stub):
-        with pytest.raises(
-                cmdutils.CommandError,
-                match="Invalid value '::' - Pattern without host"):
-            commands.config_list_remove("completion.web_history.exclude", "::")
+    # FIXME test value conversion for :list-remove like in test_dict_add_value_type
+    # (once we have a List config option using a non-str type, or a way to
+    # dynamically add new option definitions).
 
     @pytest.mark.parametrize('key', ['w', 'q'])
     @pytest.mark.parametrize('temp', [True, False])

tests/unit/config/test_configtypes.py

@@ -1629,24 +1629,7 @@ class TestDict:
                   none_ok=True)
         converted = d.to_py(val)
         expected = converted if converted else None
-        to_str = d.to_str(converted)
-
-        # YAML keys have a max length of 1024 characters:
-        # https://yaml.org/spec/1.2.2/#example-single-pair-explicit-entry
-        # Due to characters being backslash-escaped in YAML, we can't easily control
-        # the input size (short of setting it to `1024 / len("\\uXXXX")) = 170`),
-        # so we instead skip the string round trip check if the end result turned out
-        # to be too long.
-        #
-        # yaml.safe_load('{"%s": false}' % ("a" * 1022))  -> works (1033 chars total)
-        # yaml.safe_load('{"%s": false}' % ("a" * 1023))  -> fails (1034 chars total)
-        #                 ^^  ^^^^^^^^^ = 11 chars "overhead"
-        #
-        # Since this only affects .from_str() which always has error handling
-        # for YAML errors (since a user could enter invalid values anyways), we
-        # don't handle this specially in configtypes.py.
-        if len(to_str) <= 1022 + len('{"": false}'):
-            assert d.from_str(to_str) == expected
+        assert d.from_str(d.to_str(converted)) == expected
 
     @hypothesis.given(val=strategies.dictionaries(strategies.text(min_size=1),
                                                   strategies.booleans()))

tests/unit/config/test_qtargs.py

@@ -12,7 +12,7 @@ import pytest
 from qutebrowser.qt import machinery
 from qutebrowser import qutebrowser
 from qutebrowser.config import qtargs, configdata
-from qutebrowser.utils import usertypes, version, utils
+from qutebrowser.utils import usertypes, version
 
 
 @pytest.fixture
@@ -52,7 +52,6 @@ def reduce_args(config_stub, version_patcher, monkeypatch):
     config_stub.val.scrolling.bar = 'never'
     config_stub.val.qt.chromium.experimental_web_platform_features = 'never'
     config_stub.val.qt.workarounds.disable_accelerated_2d_canvas = 'never'
-    config_stub.val.qt.workarounds.disable_accessibility = 'never'
     monkeypatch.setattr(qtargs.utils, 'is_mac', False)
     # Avoid WebRTC pipewire feature
     monkeypatch.setattr(qtargs.utils, 'is_linux', False)
@@ -118,14 +117,6 @@ def test_no_webengine_available(monkeypatch, config_stub, parser, stubs):
     assert args == [sys.argv[0]]
 
 
-_XFAIL_FUTURE_QT = (
-    pytest.mark.xfail(
-        utils.VersionNumber(6, 11) not in version.WebEngineVersions._CHROMIUM_VERSIONS,
-        reason="Unknown security patch version for Qt 6.11 so far",
-    ),
-)
-
-
 @pytest.mark.usefixtures('reduce_args')
 class TestWebEngineArgs:
 
@@ -167,17 +158,12 @@ class TestWebEngineArgs:
             assert '--enable-in-process-stack-traces' not in args
 
     @pytest.mark.parametrize(
-        'qt_version, qt6, value, has_arg',
+        'qt6, value, has_arg',
         [
-            ('5.15.2', False, 'auto', False),
-            ('6.5.3', True, 'auto', True),
-            ('6.6.0', True, 'auto', True),
-            ('6.7.0', True, 'auto', True),
-            ('6.8.1', True, 'auto', True),
-            ('6.8.2', True, 'auto', False),
-            ('6.5.3', True, 'always', True),
-            ('6.5.3', True, 'never', False),
-            ('6.8.2', True, 'always', True),
+            (False, 'auto', False),
+            (True, 'auto', True),
+            (True, 'always', True),
+            (True, 'never', False),
         ],
     )
     def test_accelerated_2d_canvas(
@@ -186,12 +172,10 @@ class TestWebEngineArgs:
         version_patcher,
         config_stub,
         monkeypatch,
-        qt_version,
         qt6,
         value,
         has_arg,
     ):
-        version_patcher(qt_version)
         config_stub.val.qt.workarounds.disable_accelerated_2d_canvas = value
         monkeypatch.setattr(machinery, 'IS_QT6', qt6)
 
@@ -199,40 +183,6 @@ class TestWebEngineArgs:
         args = qtargs.qt_args(parsed)
         assert ('--disable-accelerated-2d-canvas' in args) == has_arg
 
-    @pytest.mark.parametrize(
-        "qt_version, qt6, value, has_arg",
-        [
-            ("5.15.2", False, "auto", False),
-            # 6.8.5 is broken too, but commercial-only
-            ("6.10.0", True, "always", True),
-            ("6.10.0", True, "auto", False),
-            ("6.10.1", True, "auto", True),
-            ("6.10.1", True, "never", False),
-            ("6.10.2", True, "always", True),
-            ("6.10.2", True, "auto", False),
-            pytest.param("6.11.0", True, "always", True, marks=_XFAIL_FUTURE_QT),
-            pytest.param("6.11.0", True, "auto", False, marks=_XFAIL_FUTURE_QT),
-        ],
-    )
-    def test_disable_accessibility(
-        self,
-        parser,
-        version_patcher,
-        config_stub,
-        monkeypatch,
-        qt_version,
-        qt6,
-        value,
-        has_arg,
-    ):
-        version_patcher(qt_version)
-        config_stub.val.qt.workarounds.disable_accessibility = value
-        monkeypatch.setattr(machinery, 'IS_QT6', qt6)
-
-        parsed = parser.parse_args([])
-        args = qtargs.qt_args(parsed)
-        assert ('--disable-renderer-accessibility' in args) == has_arg
-
     @pytest.mark.parametrize('flags, args', [
         ([], []),
         (['--debug-flag', 'chromium'], ['--enable-logging', '--v=1']),
@@ -513,12 +463,9 @@ class TestWebEngineArgs:
         ('6.8.3', "DocumentPictureInPictureAPI"),
         # Qt 6.9
         ('6.9.0', "DocumentPictureInPictureAPI,PermissionElement"),
-        ('6.9.1', "DocumentPictureInPictureAPI,PermissionElement"),
-        # Qt 6.10
-        ('6.10.0', "DocumentPictureInPictureAPI,PermissionElement"),
-        ('6.10.1', "DocumentPictureInPictureAPI"),
+        ('6.9.1', "DocumentPictureInPictureAPI"),  # tbd
     ])
-    def test_disable_feature_workaround(
+    def test_disble_feature_workaround(
         self, parser, version_patcher, qt_version, disabled
     ):
         version_patcher(qt_version)

tests/unit/keyinput/key_data.py

@@ -551,7 +551,6 @@ KEYS = [
 
     Key('MicVolumeUp', 'Microphone Volume Up', qtest=False),
     Key('MicVolumeDown', 'Microphone Volume Down', qtest=False),
-    Key('Keyboard', 'Keyboard', qtest=False),
 
     Key('New', qtest=False),
     Key('Open', qtest=False),

tests/unit/misc/test_crashdialog.py

@@ -32,31 +32,6 @@ Thread 0x00007fa135ac7700 (most recent call first):
   File "", line 1 in testfunc
 """
 
-VALID_CRASH_TEXT_PY314 = """
-Fatal Python error: Segmentation fault
-_
-Current thread 0x00000001fe53e140 [CrBrowserMain] (most recent call first):
-  File "qutebrowser/app.py", line 126 in qt_mainloop
-  File "qutebrowser/app.py", line 116 in run
-  File "qutebrowser/qutebrowser.py", line 234 in main
-  File "__main__.py", line 15 in <module>
-_
-Current thread's C stack trace (most recent call first):
-  Binary file "...", at _Py_DumpStack+0x48 [0x10227cc9c]
-  <truncated rest of calls>
-"""
-
-VALID_CRASH_TEXT_PY314_NO_PY = """
-Fatal Python error: Segmentation fault
-_
-Current thread 0x00007f0dc805cbc0 [qutebrowser] (most recent call first):
-  <no Python frame>
-_
-Current thread's C stack trace (most recent call first):
-  Binary file "/lib64/libpython3.14.so.1.0", at _Py_DumpStack+0x4c [0x7f0dc7b2127b]
-  <truncated rest of calls>
-"""
-
 WINDOWS_CRASH_TEXT = r"""
 Windows fatal exception: access violation
 _
@@ -70,32 +45,13 @@ Hello world!
 """
 
 
-@pytest.mark.parametrize(
-    "text, typ, func",
-    [
-        pytest.param(VALID_CRASH_TEXT, "Segmentation fault", "testfunc", id="valid"),
-        pytest.param(
-            VALID_CRASH_TEXT_THREAD, "Segmentation fault", "testfunc", id="valid-thread"
-        ),
-        pytest.param(
-            VALID_CRASH_TEXT_PY314,
-            "Segmentation fault",
-            "qt mainloop",
-            id="valid-py314",
-        ),
-        pytest.param(
-            VALID_CRASH_TEXT_PY314_NO_PY,
-            "Segmentation fault",
-            "",
-            id="valid-py314-no-py",
-        ),
-        pytest.param(VALID_CRASH_TEXT_EMPTY, "Aborted", "", id="valid-empty"),
-        pytest.param(
-            WINDOWS_CRASH_TEXT, "Windows access violation", "tabopen", id="windows"
-        ),
-        pytest.param(INVALID_CRASH_TEXT, "", "", id="invalid"),
-    ],
-)
+@pytest.mark.parametrize('text, typ, func', [
+    (VALID_CRASH_TEXT, 'Segmentation fault', 'testfunc'),
+    (VALID_CRASH_TEXT_THREAD, 'Segmentation fault', 'testfunc'),
+    (VALID_CRASH_TEXT_EMPTY, 'Aborted', ''),
+    (WINDOWS_CRASH_TEXT, 'Windows access violation', 'tabopen'),
+    (INVALID_CRASH_TEXT, '', ''),
+])
 def test_parse_fatal_stacktrace(text, typ, func):
     text = text.strip().replace('_', ' ')
     assert crashdialog.parse_fatal_stacktrace(text) == (typ, func)

tests/unit/misc/test_crashsignal.py

@@ -37,8 +37,8 @@ def signal_handler(qtbot, mocker, read_config_mock):
         app=mocker.Mock(spec=QApplication),
         quitter=mocker.Mock(spec=quitter.Quitter),
     )
-    yield signal_handler
-    signal_handler.deactivate()
+
+    return signal_handler
 
 
 def test_handlers_registered(signal_handler):

tests/unit/misc/test_pakjoy.py

@@ -12,7 +12,6 @@ import shutil
 
 import pytest
 
-from qutebrowser.qt import machinery
 from qutebrowser.misc import pakjoy, binparsing
 from qutebrowser.utils import utils, version, standarddir, usertypes
 
@@ -194,19 +193,11 @@ def read_patched_manifest():
     return json_without_comments(reparsed.manifest)
 
 
-skip_if_incompatible = pytest.mark.skipif(
-    not machinery.IS_QT6
-    or version.qtwebengine_versions(avoid_init=True).webengine
-    >= utils.VersionNumber(6, 10),
-    reason="Only needed for Qt 6; Qt 6.10+ uses gzip storage for manifest",
-)
-
-
 @pytest.mark.usefixtures("affected_version")
-@skip_if_incompatible
 class TestWithRealResourcesFile:
     """Tests that use the real pak file form the Qt installation."""
 
+    @pytest.mark.qt6_only
     def test_happy_path(self):
         # Go through the full patching processes with the real resources file from
         # the current installation. Make sure our replacement string is in it
@@ -266,6 +257,7 @@ class TestWithRealResourcesFile:
             "Not applying quirks. Expected location: "
         )
 
+    @pytest.mark.qt6_only
     def test_hardcoded_ids(self):
         """Make sure we hardcoded the currently valid ID.
 
@@ -453,7 +445,6 @@ class TestWithConstructedResourcesFile:
     def quirk_dir_path(self, tmp_path: pathlib.Path) -> pathlib.Path:
         return tmp_path / "cache" / pakjoy.CACHE_DIR_NAME
 
-    @skip_if_incompatible
     def test_patching(self, resources_path: pathlib.Path, quirk_dir_path: pathlib.Path):
         """Go through the full patching processes with a fake resources file."""
         with pakjoy.patch_webengine():
@@ -466,14 +457,13 @@ class TestWithConstructedResourcesFile:
         )
         assert pakjoy.RESOURCES_ENV_VAR not in os.environ
 
-    @skip_if_incompatible
+    @pytest.mark.qt6_only
     def test_explicitly_enabled(self, monkeypatch: pytest.MonkeyPatch, config_stub):
         patch_version(monkeypatch, utils.VersionNumber(6, 7))  # unaffected
         config_stub.val.qt.workarounds.disable_hangouts_extension = True
         with pakjoy.patch_webengine():
             assert pakjoy.RESOURCES_ENV_VAR in os.environ
 
-    @skip_if_incompatible
     def test_preset_env_var(
         self,
         resources_path: pathlib.Path,

tests/unit/misc/test_wmname.py

@@ -1,313 +0,0 @@
-# SPDX-FileCopyrightText: Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import os
-import sys
-import socket
-import ctypes
-import ctypes.util
-import unittest.mock
-from collections.abc import Iterator
-
-import pytest
-import pytest_mock
-import pytestqt.qtbot
-from qutebrowser.qt.widgets import QApplication, QWidget
-
-from qutebrowser.misc import wmname
-
-
-def test_load_libwayland_client():
-    """Test loading the Wayland client library, which might or might not exist."""
-    try:
-        wmname._load_library("wayland-client")
-    except wmname.Error:
-        pass
-
-
-def test_load_libwayland_client_error(mocker: pytest_mock.MockerFixture):
-    """Test that an error in loading the Wayland client library raises an error."""
-    mocker.patch.object(ctypes.util, "find_library", return_value="libwayland-client.so.6")
-    mocker.patch("ctypes.CDLL", side_effect=OSError("Library not found"))
-
-    with pytest.raises(wmname.Error, match="Failed to load wayland-client"):
-        wmname._load_library("wayland-client")
-
-
-@pytest.fixture
-def sock() -> Iterator[socket.socket]:
-    """Fixture to create a Unix domain socket."""
-    parent_sock, child_sock = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
-    yield parent_sock
-    parent_sock.close()
-    child_sock.close()
-
-
-@pytest.mark.linux
-def test_pid_from_fd(sock: socket.socket):
-    assert wmname._pid_from_fd(sock.fileno()) == os.getpid()
-
-
-@pytest.mark.skipif(
-    not hasattr(socket, "SO_PEERCRED"), reason="socket.SO_PEERCRED not available"
-)
-def test_pid_from_fd_invalid():
-    """Test that an invalid file descriptor raises an error."""
-    with pytest.raises(
-        wmname.Error,
-        match=r"Error creating socket for fd -1: \[Errno 9\] Bad file descriptor",
-    ):
-        wmname._pid_from_fd(-1)
-
-
-@pytest.mark.linux
-def test_pid_from_fd_getsockopt_error(
-    sock: socket.socket, mocker: pytest_mock.MockerFixture
-):
-    """Test that an error in getsockopt raises an error."""
-    mocker.patch.object(
-        socket.socket, "getsockopt", side_effect=OSError("Mocked error")
-    )
-
-    with pytest.raises(wmname.Error, match="Error getting SO_PEERCRED for fd"):
-        wmname._pid_from_fd(sock.fileno())
-
-
-def test_pid_from_fd_no_so_peercred(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.delattr(socket, "SO_PEERCRED", raising=False)
-    with pytest.raises(wmname.Error, match=r"Missing socket\.SO_PEERCRED"):
-        wmname._pid_from_fd(-1)
-
-
-@pytest.mark.linux
-def test_process_name_from_pid():
-    """Test getting the process name from a PID."""
-    pid = os.getpid()
-    name = wmname._process_name_from_pid(pid)
-    assert os.path.basename(name.split()[0]) == os.path.basename(sys.executable)
-
-
-def test_process_name_from_pid_invalid():
-    """Test that an invalid PID raises an error."""
-    with pytest.raises(wmname.Error, match=r"Error opening .proc.-1.cmdline"):
-        wmname._process_name_from_pid(-1)
-
-
-@pytest.fixture
-def libwayland_client_mock(mocker: pytest_mock.MockerFixture) -> None:
-    """Mock the libwayland-client library."""
-    return mocker.Mock()
-
-
-@pytest.fixture
-def fake_wayland_display() -> wmname._WaylandDisplay:
-    return wmname._WaylandDisplay(ctypes.pointer(wmname._WaylandDisplayStruct()))
-
-
-def test_wayland_display(
-    libwayland_client_mock: unittest.mock.Mock,
-    fake_wayland_display: wmname._WaylandDisplay,
-):
-    """Test getting the Wayland display."""
-    libwayland_client_mock.wl_display_connect.return_value = fake_wayland_display
-
-    with wmname._wayland_display(libwayland_client_mock):
-        pass
-
-    libwayland_client_mock.wl_display_connect.assert_called_once_with(None)
-    libwayland_client_mock.wl_display_disconnect.assert_called_once_with(
-        fake_wayland_display
-    )
-
-
-def test_wayland_display_error(libwayland_client_mock: unittest.mock.Mock):
-    """Test that an error in getting the Wayland display raises an error."""
-    libwayland_client_mock.wl_display_connect.return_value = ctypes.c_void_p(0)
-
-    with pytest.raises(wmname.Error, match="Can't connect to display"):
-        with wmname._wayland_display(libwayland_client_mock):
-            pass
-
-    libwayland_client_mock.wl_display_disconnect.assert_not_called()  # Not called on error
-
-
-def test_wayland_get_fd(
-    libwayland_client_mock: unittest.mock.Mock,
-    fake_wayland_display: wmname._WaylandDisplay,
-):
-    """Test getting the file descriptor from a Wayland display."""
-    libwayland_client_mock.wl_display_get_fd.return_value = 42
-
-    fd = wmname._wayland_get_fd(libwayland_client_mock, fake_wayland_display)
-    assert fd == 42
-
-    libwayland_client_mock.wl_display_get_fd.assert_called_once_with(
-        fake_wayland_display
-    )
-
-
-def test_wayland_get_fd_error(
-    libwayland_client_mock: unittest.mock.Mock,
-    fake_wayland_display: wmname._WaylandDisplay,
-):
-    """Test that an error in getting the file descriptor raises an error."""
-    libwayland_client_mock.wl_display_get_fd.return_value = -1
-
-    with pytest.raises(
-        wmname.Error, match="Failed to get Wayland display file descriptor: -1"
-    ):
-        wmname._wayland_get_fd(libwayland_client_mock, fake_wayland_display)
-
-    libwayland_client_mock.wl_display_get_fd.assert_called_once_with(
-        fake_wayland_display
-    )
-
-
-def test_wayland_real():
-    """Test getting the Wayland window manager name."""
-    try:
-        name = wmname.wayland_compositor_name()
-    except wmname.Error:
-        return
-
-    assert isinstance(name, str)
-    assert name
-
-
-def test_load_xlib():
-    """Test loading Xlib, which might or might not exist."""
-    try:
-        wmname._load_library("X11")
-    except wmname.Error:
-        pass
-
-
-def test_load_xlib_not_found(monkeypatch: pytest.MonkeyPatch):
-    """Test loading Xlib simulating a missing library."""
-    monkeypatch.setattr(ctypes.util, "find_library", lambda x: None)
-
-    with pytest.raises(wmname.Error, match="X11 library not found"):
-        wmname._load_library("X11")
-
-
-def test_load_xlib_error(mocker: pytest_mock.MockerFixture):
-    """Test that an error in loading Xlib raises an error."""
-    mocker.patch.object(ctypes.util, "find_library", return_value="libX11.so.6")
-    mocker.patch.object(ctypes, "CDLL", side_effect=OSError("Failed to load library"))
-
-    with pytest.raises(
-        wmname.Error, match="Failed to load X11 library: Failed to load library"
-    ):
-        wmname._load_library("X11")
-
-
-@pytest.fixture
-def xlib_mock(mocker: pytest_mock.MockerFixture) -> None:
-    """Mock the XLib library."""
-    return mocker.Mock()
-
-
-@pytest.fixture
-def fake_x11_display() -> wmname._X11Display:
-    return wmname._X11Display(ctypes.pointer(wmname._X11DisplayStruct()))
-
-
-def test_x11_display(
-    xlib_mock: unittest.mock.Mock,
-    fake_x11_display: wmname._X11Display,
-):
-    """Test getting the X11 display."""
-    xlib_mock.XOpenDisplay.return_value = fake_x11_display
-
-    with wmname._x11_open_display(xlib_mock):
-        pass
-
-    xlib_mock.XOpenDisplay.assert_called_once_with(None)
-    xlib_mock.XCloseDisplay.assert_called_once_with(fake_x11_display)
-
-
-def test_x11_display_error(xlib_mock: unittest.mock.Mock):
-    """Test that an error in getting the X11 display raises an error."""
-    xlib_mock.XOpenDisplay.return_value = ctypes.c_void_p(0)
-
-    with pytest.raises(wmname.Error, match="Cannot open display"):
-        with wmname._x11_open_display(xlib_mock):
-            pass
-
-    xlib_mock.XCloseDisplay.assert_not_called()  # Not called on error
-
-
-def test_x11_intern_atom(
-    xlib_mock: unittest.mock.Mock,
-    fake_x11_display: wmname._X11Display,
-):
-    """Test getting an interned atom from X11."""
-    atom_name = b"_NET_WM_NAME"
-    atom = 12345
-    xlib_mock.XInternAtom.return_value = atom
-
-    result = wmname._x11_intern_atom(xlib_mock, fake_x11_display, atom_name)
-    assert result == atom
-
-    xlib_mock.XInternAtom.assert_called_once_with(
-        fake_x11_display,
-        atom_name,
-        True,  # don't create if not found
-    )
-
-
-def test_x11_intern_atom_error(
-    xlib_mock: unittest.mock.Mock,
-    fake_x11_display: wmname._X11Display,
-):
-    """Test that an error in getting an interned atom raises an error."""
-    xlib_mock.XInternAtom.return_value = 0
-
-    with pytest.raises(wmname.Error, match="Failed to intern atom: b'_NET_WM_NAME'"):
-        wmname._x11_intern_atom(xlib_mock, fake_x11_display, b"_NET_WM_NAME")
-
-    xlib_mock.XInternAtom.assert_called_once_with(
-        fake_x11_display,
-        b"_NET_WM_NAME",
-        True,  # don't create if not found
-    )
-
-
-def test_x11_get_wm_name(
-    qapp: QApplication,
-    qtbot: pytestqt.qtbot.QtBot,
-) -> None:
-    """Test getting a property from X11.
-
-    This is difficult to mock (as it involves a C layer via ctypes with return
-    arguments), so we instead try getting data from a real window.
-    """
-    if qapp.platformName() != "xcb":
-        pytest.skip("This test only works on X11 (xcb) platforms")
-
-    w = QWidget()
-    qtbot.add_widget(w)
-    w.setWindowTitle("Test Window")
-
-    xlib = wmname._load_library("X11")
-    with wmname._x11_open_display(xlib) as display:
-        atoms = wmname._X11Atoms(
-            NET_SUPPORTING_WM_CHECK=-1,
-            NET_WM_NAME=wmname._x11_intern_atom(xlib, display, b"_NET_WM_NAME"),
-            UTF8_STRING=wmname._x11_intern_atom(xlib, display, b"UTF8_STRING"),
-        )
-        window = wmname._X11Window(int(w.winId()))
-        name = wmname._x11_get_wm_name(xlib, display, atoms=atoms, wm_window=window)
-
-    assert name == "Test Window"
-
-
-def test_x11_real():
-    try:
-        name = wmname.x11_wm_name()
-    except wmname.Error:
-        return
-
-    assert isinstance(name, str)
-    assert name

tests/unit/utils/test_version.py

@@ -15,21 +15,17 @@ import textwrap
 import datetime
 import dataclasses
 import importlib.metadata
-import unittest.mock
-from typing import Any
 
 import pytest
-import pytest_mock
 import hypothesis
 import hypothesis.strategies
 from qutebrowser.qt import machinery
-from qutebrowser.qt.core import PYQT_VERSION_STR, QUrl
-from qutebrowser.qt.webenginecore import QWebEngineProfile
+from qutebrowser.qt.core import PYQT_VERSION_STR
 
 import qutebrowser
 from qutebrowser.config import config, websettings
 from qutebrowser.utils import version, usertypes, utils, standarddir
-from qutebrowser.misc import pastebin, objects, elf, wmname
+from qutebrowser.misc import pastebin, objects, elf
 from qutebrowser.browser import pdfjs
 
 try:
@@ -624,43 +620,39 @@ def test_path_info(monkeypatch, equal):
         assert pathinfo['system data'] == 'SYSTEM DATA PATH'
 
 
+@pytest.fixture
+def import_fake(stubs, monkeypatch):
+    """Fixture to patch imports using ImportFake."""
+    fake = stubs.ImportFake(dict.fromkeys(version.MODULE_INFO, True), monkeypatch)
+    fake.patch()
+    return fake
+
+
 class TestModuleVersions:
 
     """Tests for _module_versions() and ModuleInfo."""
 
-    @pytest.fixture
-    def import_fake(self, stubs, monkeypatch):
-        """Fixture to patch imports using ImportFake."""
-        fake = stubs.ImportFake(dict.fromkeys(version.MODULE_INFO, True), monkeypatch)
-        fake.patch()
-        return fake
-
-    @pytest.fixture(autouse=True)
-    def importlib_metadata_mock(
-        self, mocker: pytest_mock.MockerFixture
-    ) -> unittest.mock.Mock:
-        return mocker.patch("importlib.metadata.version", return_value="4.5.6")
-
     def test_all_present(self, import_fake):
-        """Test with all modules present in a fixed version."""
+        """Test with all modules present in version 1.2.3."""
         expected = []
         for name in import_fake.modules:
             version.MODULE_INFO[name]._reset_cache()
             if '__version__' not in version.MODULE_INFO[name]._version_attributes:
-                expected.append(f"{name}: 4.5.6")  # from importlib.metadata
+                expected.append('{}: yes'.format(name))
             else:
-                expected.append(f"{name}: 1.2.3")
+                expected.append('{}: 1.2.3'.format(name))
         assert version._module_versions() == expected
 
-    @pytest.mark.parametrize('module, expected', [
-        ('colorama', 'colorama: no'),
-        ('adblock', 'adblock: no'),
+    @pytest.mark.parametrize('module, idx, expected', [
+        ('colorama', 0, 'colorama: no'),
+        ('adblock', 4, 'adblock: no'),
     ])
-    def test_missing_module(self, module, expected, import_fake):
+    def test_missing_module(self, module, idx, expected, import_fake):
         """Test with a module missing.
 
         Args:
             module: The name of the missing module.
+            idx: The index where the given text is expected.
             expected: The expected text.
         """
         import_fake.modules[module] = False
@@ -668,7 +660,6 @@ class TestModuleVersions:
         mod_info = version.MODULE_INFO[module]
         mod_info._reset_cache()
 
-        idx = list(version.MODULE_INFO).index(module)
         assert version._module_versions()[idx] == expected
 
         for method_name, expected_result in [
@@ -702,16 +693,7 @@ class TestModuleVersions:
         assert not mod_info.is_usable()
 
         expected = f"adblock: {fake_version} (< {mod_info.min_version}, outdated)"
-        idx = list(version.MODULE_INFO).index("adblock")
-        assert version._module_versions()[idx] == expected
-
-    def test_importlib_not_found(self, importlib_metadata_mock: unittest.mock.Mock):
-        """Test with no __version__ attribute and missing importlib.metadata."""
-        assert not version.MODULE_INFO["jinja2"]._version_attributes  # sanity check
-        importlib_metadata_mock.side_effect = importlib.metadata.PackageNotFoundError
-        version.MODULE_INFO["jinja2"]._reset_cache()
-        idx = list(version.MODULE_INFO).index("jinja2")
-        assert version._module_versions()[idx] == "jinja2: unknown"
+        assert version._module_versions()[4] == expected
 
     @pytest.mark.parametrize('attribute, expected_modules', [
         ('VERSION', ['colorama']),
@@ -740,17 +722,17 @@ class TestModuleVersions:
             mod_info = version.MODULE_INFO[name]
             if name in expected_modules:
                 assert mod_info.get_version() == "1.2.3"
-                expected.append(f"{name}: 1.2.3")
+                expected.append('{}: 1.2.3'.format(name))
             else:
-                assert mod_info.get_version() == "4.5.6"  # from importlib.metadata
-                expected.append(f"{name}: 4.5.6")
+                assert mod_info.get_version() is None
+                expected.append('{}: yes'.format(name))
 
         assert version._module_versions() == expected
 
     @pytest.mark.parametrize('name, has_version', [
         ('sip', False),
         ('colorama', True),
-        # jinja2: removed in 3.3
+        ('jinja2', True),
         ('pygments', True),
         ('yaml', True),
         ('adblock', True),
@@ -1154,7 +1136,13 @@ class TestChromiumVersion:
 
     def test_prefers_saved_user_agent(self, monkeypatch, patch_no_api):
         webenginesettings._init_user_agent_str(_QTWE_USER_AGENT.format('87'))
-        monkeypatch.setattr(QWebEngineProfile, "defaultProfile", lambda: 1/0)
+
+        class FakeProfile:
+            def defaultProfile(self):
+                raise AssertionError("Should not be called")
+
+        monkeypatch.setattr(webenginesettings, 'QWebEngineProfile', FakeProfile())
+
         version.qtwebengine_versions()
 
     def test_unpatched(self, qapp, cache_tmpdir, data_tmpdir, config_stub):
@@ -1275,67 +1263,10 @@ class TestChromiumVersion:
         assert versions.webengine == override
 
 
-class FakeExtensionInfo:
-    def __init__(
-        self,
-        name: str,
-        *,
-        enabled: bool = False,
-        installed: bool = False,
-        loaded: bool = False,
-        action_popup_url: QUrl = QUrl(),
-    ) -> None:
-        self._name = name
-        self.enabled = enabled
-        self.installed = installed
-        self.loaded = loaded
-        self.action_popup_url = action_popup_url
-
-    def isEnabled(self) -> bool:
-        return self.enabled
-
-    def isInstalled(self) -> bool:
-        return self.installed
-
-    def isLoaded(self) -> bool:
-        return self.loaded
-
-    def name(self) -> str:
-        return self._name
-
-    def actionPopupUrl(self) -> QUrl:
-        return self.action_popup_url
-
-    def path(self) -> str:
-        return f"{self._name}-path"
-
-    def id(self) -> str:
-        return f"{self._name}-id"
-
-
-class FakeExtensionManager:
-
-    def __init__(self, extensions: list[FakeExtensionInfo]) -> None:
-        self._extensions = extensions
-
-    def extensions(self) -> list[FakeExtensionInfo]:
-        return self._extensions
-
-
-class FakeExtensionProfile:
-
-    def __init__(self, ext_manager: FakeExtensionManager) -> None:
-        self._ext_manager = ext_manager
-
-    def extensionManager(self) -> FakeExtensionManager:
-        return self._ext_manager
-
-
 @dataclasses.dataclass
 class VersionParams:
 
     name: str
-    gui_platform: str = 'GUI_PLATFORM'
     git_commit: bool = True
     frozen: bool = False
     qapp: bool = True
@@ -1356,8 +1287,6 @@ class VersionParams:
     VersionParams('no-ssl', ssl_support=False),
     VersionParams('no-autoconfig-loaded', autoconfig_loaded=False),
     VersionParams('no-config-py-loaded', config_py_loaded=False),
-    VersionParams('xcb-platform', gui_platform='xcb'),
-    VersionParams('wayland-platform', gui_platform='wayland'),
 ], ids=lambda param: param.name)
 def test_version_info(params, stubs, monkeypatch, config_stub):
     """Test version.version_info()."""
@@ -1378,21 +1307,16 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
         'QSslSocket': FakeQSslSocket('SSL VERSION', params.ssl_support),
         'platform.platform': lambda: 'PLATFORM',
         'platform.architecture': lambda: ('ARCHITECTURE', ''),
-        'wmname.x11_wm_name': lambda: 'X11 WM NAME',
-        'wmname.wayland_compositor_name': lambda: 'WAYLAND COMPOSITOR NAME',
         '_os_info': lambda: ['OS INFO 1', 'OS INFO 2'],
         '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
-        'objects.qapp': (
-            stubs.FakeQApplication(style='STYLE', platform_name=params.gui_platform)
-            if params.qapp
-            else None
-        ),
+        'objects.qapp': (stubs.FakeQApplication(style='STYLE', platform_name='PLATFORM')
+                         if params.qapp else None),
         'qtutils.library_path': (lambda _loc: 'QT PATH'),
         'sql.version': lambda: 'SQLITE VERSION',
         '_uptime': lambda: datetime.timedelta(hours=1, minutes=23, seconds=45),
         'config.instance.yaml_loaded': params.autoconfig_loaded,
         'machinery.INFO': machinery.SelectionInfo(
-            wrapper='QT WRAPPER',
+            wrapper="QT WRAPPER",
             reason=machinery.SelectionReason.fake
         ),
     }
@@ -1400,23 +1324,11 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
     version.opengl_info.cache_clear()
     monkeypatch.setenv('QUTE_FAKE_OPENGL', 'VENDOR, 1.0 VERSION')
 
-    if not params.qapp:
-        expected_gui_platform = None
-    elif params.gui_platform == 'GUI_PLATFORM':
-        expected_gui_platform = 'GUI_PLATFORM'
-    elif params.gui_platform == 'xcb':
-        expected_gui_platform = 'xcb (X11 WM NAME)'
-    elif params.gui_platform == 'wayland':
-        expected_gui_platform = 'wayland (WAYLAND COMPOSITOR NAME)'
-    else:
-        raise utils.Unreachable(params.gui_platform)
-
     substitutions = {
         'git_commit': '\nGit commit: GIT COMMIT' if params.git_commit else '',
         'style': '\nStyle: STYLE' if params.qapp else '',
-        'platform_plugin': (
-            f'\nQt Platform: {expected_gui_platform}' if params.qapp else ''
-        ),
+        'platform_plugin': ('\nPlatform plugin: PLATFORM' if params.qapp
+                            else ''),
         'opengl': '\nOpenGL: VENDOR, 1.0 VERSION' if params.qapp else '',
         'qt': 'QT VERSION',
         'frozen': str(params.frozen),
@@ -1424,7 +1336,6 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
         'python_path': 'EXECUTABLE PATH',
         'uptime': "1:23:45",
         'autoconfig_loaded': "yes" if params.autoconfig_loaded else "no",
-        'webextensions': "",  # overridden below if QtWebEngine is used
     }
 
     patches['qtwebengine_versions'] = (
@@ -1447,19 +1358,6 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
         substitutions['backend'] = 'new QtWebKit (WebKit WEBKIT VERSION)'
     else:
         monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False)
-        if machinery.IS_QT6:
-            monkeypatch.setattr(
-                webenginesettings,
-                "default_profile",
-                FakeExtensionProfile(FakeExtensionManager([FakeExtensionInfo("ext1")])),
-            )
-            substitutions['webextensions'] = (
-                "\n"
-                "WebExtensions:\n"
-                "  ext1 (ext1-id)\n"
-                "  [ ] enabled  [ ] loaded  [ ] installed\n"
-                "  ext1-path\n"
-            )
         patches['objects.backend'] = usertypes.Backend.QtWebEngine
         substitutions['backend'] = 'QtWebEngine 1.2.3\n  (source: faked)'
 
@@ -1499,7 +1397,7 @@ def test_version_info(params, stubs, monkeypatch, config_stub):
         pdf.js: PDFJS VERSION
         sqlite: SQLITE VERSION
         QtNetwork SSL: {ssl}
-        {webextensions}{style}{platform_plugin}{opengl}
+        {style}{platform_plugin}{opengl}
         Platform: PLATFORM, ARCHITECTURE{linuxdist}
         Frozen: {frozen}
         Imported from {import_path}
@@ -1584,108 +1482,6 @@ class TestOpenGLInfo:
         assert str(info) == 'OpenGL ES'
 
 
-@pytest.mark.skipif(
-    not machinery.IS_QT6, reason="extensions are only available with Qt6"
-)
-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(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(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:
-        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",
-        [
-            pytest.param([], ["WebExtensions: none"], id="empty"),
-            pytest.param(
-                [FakeExtensionInfo("ext1")],
-                [
-                    "WebExtensions:",
-                    "  ext1 (ext1-id)",
-                    "  [ ] enabled  [ ] loaded  [ ] installed",
-                    "  ext1-path",
-                    "",
-                ],
-                id="single",
-            ),
-            pytest.param(
-                [
-                    FakeExtensionInfo("ext1", enabled=True),
-                    FakeExtensionInfo(
-                        "ext2", enabled=True, loaded=True, installed=True
-                    ),
-                ],
-                [
-                    "WebExtensions:",
-                    "  ext1 (ext1-id)",
-                    "  [x] enabled  [ ] loaded  [ ] installed",
-                    "  ext1-path",
-                    "",
-                    "  ext2 (ext2-id)",
-                    "  [x] enabled  [x] loaded  [x] installed",
-                    "  ext2-path",
-                    "",
-                ],
-                id="multiple",
-            ),
-            pytest.param(
-                [
-                    FakeExtensionInfo(
-                        "ext", action_popup_url=QUrl("chrome-extension://ext")
-                    )
-                ],
-                [
-                    "WebExtensions:",
-                    "  ext (ext-id)",
-                    "  [ ] enabled  [ ] loaded  [ ] installed",
-                    "  ext-path",
-                    "  chrome-extension://ext",
-                    "",
-                ],
-                id="with-url",
-            ),
-        ],
-    )
-    def test_extensions(
-        self,
-        monkeypatch: pytest.MonkeyPatch,
-        extensions: list[FakeExtensionInfo],
-        expected: list[str],
-    ) -> None:
-        monkeypatch.setattr(
-            webenginesettings,
-            "default_profile",
-            FakeExtensionProfile(FakeExtensionManager(extensions)),
-        )
-        assert version._webengine_extensions() == expected
-
-
 @pytest.fixture
 def pbclient(stubs):
     http_stub = stubs.HTTPPostStub()
@@ -1740,46 +1536,6 @@ def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch):
     assert msg.text == "Failed to pastebin version info: test"
 
 
-@pytest.mark.parametrize("platform, expected", [
-    ("windows", "windows"),
-    ("xcb", "xcb (X11 WM NAME)"),
-    ("wayland", "wayland (WAYLAND COMPOSITOR NAME)"),
-    ("wayland-egl", "wayland-egl (WAYLAND COMPOSITOR NAME)"),
-])
-def test_gui_platform_info(
-    platform: str, expected: str, monkeypatch: pytest.MonkeyPatch, stubs: Any
-) -> None:
-    monkeypatch.setattr(
-        version.objects,
-        "qapp",
-        stubs.FakeQApplication(platform_name=platform, style="STYLE"),
-    )
-    monkeypatch.setattr(version.wmname, "x11_wm_name", lambda: "X11 WM NAME")
-    monkeypatch.setattr(
-        version.wmname, "wayland_compositor_name", lambda: "WAYLAND COMPOSITOR NAME"
-    )
-    assert version.gui_platform_info() == expected
-
-
-@pytest.mark.parametrize("platform", ["xcb", "wayland", "wayland-egl"])
-def test_gui_platform_info_error(
-    platform: str,
-    monkeypatch: pytest.MonkeyPatch,
-    mocker: pytest_mock.MockerFixture,
-    stubs: Any,
-) -> None:
-    monkeypatch.setattr(
-        version.objects,
-        "qapp",
-        stubs.FakeQApplication(platform_name=platform, style="STYLE"),
-    )
-    mocker.patch.object(wmname, "x11_wm_name", side_effect=wmname.Error("fake error"))
-    mocker.patch.object(
-        wmname, "wayland_compositor_name", side_effect=wmname.Error("fake error")
-    )
-    assert version.gui_platform_info() == f"{platform} (Error: fake error)"
-
-
 def test_uptime(monkeypatch, qapp):
     """Test _uptime runs and check if microseconds are dropped."""
     monkeypatch.setattr(objects, 'qapp', qapp)

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py39-pyqt515-cov,mypy-pyqt5,misc,vulture,flake8,pylint,pyroma,eslint,yamllint,actionlint
+envlist = py39-pyqt515-cov,mypy-pyqt5,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint,actionlint
 distshare = {toxworkdir}
 skipsdist = true
 minversion = 3.20
@@ -57,9 +57,8 @@ deps =
     pyqt67: -r{toxinidir}/misc/requirements/requirements-pyqt-6.7.txt
     pyqt68: -r{toxinidir}/misc/requirements/requirements-pyqt-6.8.txt
     pyqt69: -r{toxinidir}/misc/requirements/requirements-pyqt-6.9.txt
-    pyqt610: -r{toxinidir}/misc/requirements/requirements-pyqt-6.10.txt
 commands =
-    !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67-!pyqt68-!pyqt69-!pyqt610: {envpython} scripts/link_pyqt.py --tox {envdir}
+    !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67-!pyqt68-!pyqt69: {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}
     cov: {envpython} scripts/dev/check_coverage.py {posargs}
 
@@ -168,7 +167,15 @@ passenv =
 deps =
     -r{toxinidir}/misc/requirements/requirements-pyroma.txt
 commands =
-    {envdir}/bin/pyroma -n 10 .
+    {envdir}/bin/pyroma .
+
+[testenv:check-manifest]
+basepython = {env:PYTHON:python3}
+passenv =
+deps =
+     -r{toxinidir}/misc/requirements/requirements-check-manifest.txt
+commands =
+    {envdir}/bin/check-manifest --ignore 'qutebrowser/git-commit-id,qutebrowser/html/doc,qutebrowser/html/doc/*,qutebrowser/html/doc/img/cheatsheet-*.png,*/__pycache__'
 
 [testenv:docs]
 basepython = {env:PYTHON:python3}
@@ -214,14 +221,14 @@ deps =
 allowlist_externals = bash
 commands = bash scripts/dev/run_shellcheck.sh {posargs}
 
-[testenv:mypy{,-pyqt5,-pyqt6}]
+[testenv:mypy-{pyqt5,pyqt6}]
 basepython = {env:PYTHON:python3}
 passenv =
     TERM
     MYPY_FORCE_TERMINAL_WIDTH
 setenv =
     # See qutebrowser/qt/machinery.py
-    !pyqt5: QUTE_CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 --always-true=IS_PYQT --always-false=IS_PYSIDE
+    pyqt6: QUTE_CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 --always-true=IS_PYQT --always-false=IS_PYSIDE
     pyqt5: QUTE_CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6 --always-true=IS_PYQT --always-false=IS_PYSIDE
 deps =
     -r{toxinidir}/requirements.txt