From 4ae8e247d03aa1235d4fac6fca4abc90a327ca11 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 19 Jun 2017 10:24:33 +0200 Subject: [PATCH] Show 'legacy QtWebKit' in version output --- qutebrowser/utils/version.py | 5 +++-- tests/unit/utils/test_version.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index af945ca83..08779e097 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -296,8 +296,9 @@ def _chromium_version(): def _backend(): """Get the backend line with relevant information.""" if objects.backend == usertypes.Backend.QtWebKit: - return 'QtWebKit{} (WebKit {})'.format( - '-NG' if qtutils.is_qtwebkit_ng() else '', qWebKitVersion()) + return '{} (WebKit {})'.format( + 'QtWebKit-NG' if qtutils.is_qtwebkit_ng() else 'legacy QtWebKit', + qWebKitVersion()) else: webengine = usertypes.Backend.QtWebEngine assert objects.backend == webengine, objects.backend diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index 20863d0b2..54ee2cdd0 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -849,11 +849,12 @@ def test_version_output(git_commit, frozen, style, with_webkit, patches['objects.backend'] = usertypes.Backend.QtWebKit patches['QWebEngineProfile'] = None if with_webkit == 'ng': + backend = 'QtWebKit-NG' patches['qtutils.is_qtwebkit_ng'] = lambda: True - substitutions['backend'] = 'QtWebKit-NG (WebKit WEBKIT VERSION)' else: + backend = 'legacy QtWebKit' patches['qtutils.is_qtwebkit_ng'] = lambda: False - substitutions['backend'] = 'QtWebKit (WebKit WEBKIT VERSION)' + substitutions['backend'] = backend + ' (WebKit WEBKIT VERSION)' else: monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False) patches['objects.backend'] = usertypes.Backend.QtWebEngine