diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index af1b5c0c3..daa90f85a 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -67,8 +67,8 @@ class WebEngineView(QWebEngineView): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-54419 vercheck = qtutils.version_check qtbug_54419_fixed = ((vercheck('5.6.2') and not vercheck('5.7.0')) or - qtutils.version_check('5.7.1') or - os.environ.get('QUTE_QTBUG54419_PATCHED', '')) + qtutils.version_check('5.7.1') or + os.environ.get('QUTE_QTBUG54419_PATCHED', '')) if not qtbug_54419_fixed: message.error(self._win_id, "Qt 5.6.2/5.7.1 or newer is required " "to open new tabs via JS!") diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index 3f0eb702a..336d22679 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -100,6 +100,7 @@ def _get_version_tag(tag): else: raise ValueError("Invalid package {!r}".format(package)) + def _get_backend_tag(tag): """Handle a @qtwebengine_*/@qtwebkit_skip tag.""" pytest_marks = { @@ -140,15 +141,13 @@ def pytest_collection_modifyitems(config, items): # markers, so we should apply the most general markers last. markers = [ ('qtwebengine_createWindow', 'Skipped because of QTBUG-54419', - pytest.mark.skipif, - not qtbug_54419_fixed and - config.webengine), + pytest.mark.skipif, not qtbug_54419_fixed and config.webengine), ('qtwebengine_todo', 'QtWebEngine TODO', pytest.mark.xfail, - config.webengine), + config.webengine), ('qtwebengine_skip', 'Skipped with QtWebEngine', pytest.mark.skipif, - config.webengine), + config.webengine), ('qtwebkit_skip', 'Skipped with QtWebKit', pytest.mark.skipif, - not config.webengine), + not config.webengine), ] for item in items: