summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-11-13 19:04:45 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-11-13 19:04:45 +0100
commit4ace7502c54974e325b7ca9c2d9de217afa39082 (patch)
tree9eaab482c65c66bcb3843139be444ae0c5e49fbc
parent60f281eb30f6913423b0b5f99208f95ae8449fae (diff)
downloadqutebrowser-4ace7502c54974e325b7ca9c2d9de217afa39082.tar.gz
qutebrowser-4ace7502c54974e325b7ca9c2d9de217afa39082.zip
Update docs/changelog
-rw-r--r--doc/changelog.asciidoc5
-rw-r--r--tests/end2end/conftest.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index f6e58a8b9..7abaffcad 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -26,6 +26,11 @@ Changed
in use.
- The `:tab-move` command now takes `start` and `end` as `index` to move a tab
to the first/last position.
+- Tests now automatically pick the backend (QtWebKit/QtWebEngine) based on
+ what's available. The `QUTE_BDD_WEBENGINE` environment variable and
+ `--qute-bdd-webengine` argument got replaced by `QUTE_TESTS_BACKEND` and
+ `--qute-backend` respectively, which can be set to either `webengine` or
+ `webkit`.
[[v2.4.1]]
v2.4.1 (unreleased)
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 563c380f2..16170d460 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -165,7 +165,7 @@ if not getattr(sys, 'frozen', False):
def pytest_collection_modifyitems(config, items):
- """Apply @qtwebengine_* markers; skip unittests with QUTE_BDD_BACKEND=webengine."""
+ """Apply @qtwebengine_* markers."""
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-75884
# (note this isn't actually fixed properly before Qt 5.15)
header_bug_fixed = qtutils.version_check('5.15', compiled=False)