rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show 'legacy QtWebKit' in version output

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-19 10:24:33 +02:00
parent 8191a5465a
commit 4ae8e247d0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/utils/version.py
View File

@ -296,8 +296,9 @@ def _chromium_version():
def _backend(): def _backend():
"""Get the backend line with relevant information.""" """Get the backend line with relevant information."""
if objects.backend == usertypes.Backend.QtWebKit: if objects.backend == usertypes.Backend.QtWebKit:
return 'QtWebKit{} (WebKit {})'.format( return '{} (WebKit {})'.format(
'-NG' if qtutils.is_qtwebkit_ng() else '', qWebKitVersion()) 'QtWebKit-NG' if qtutils.is_qtwebkit_ng() else 'legacy QtWebKit',
qWebKitVersion())
else: else:
webengine = usertypes.Backend.QtWebEngine webengine = usertypes.Backend.QtWebEngine
assert objects.backend == webengine, objects.backend assert objects.backend == webengine, objects.backend

5
tests/unit/utils/test_version.py
View File

@ -849,11 +849,12 @@ def test_version_output(git_commit, frozen, style, with_webkit,
patches['objects.backend'] = usertypes.Backend.QtWebKit patches['objects.backend'] = usertypes.Backend.QtWebKit
patches['QWebEngineProfile'] = None patches['QWebEngineProfile'] = None
if with_webkit == 'ng': if with_webkit == 'ng':
backend = 'QtWebKit-NG'
patches['qtutils.is_qtwebkit_ng'] = lambda: True patches['qtutils.is_qtwebkit_ng'] = lambda: True
substitutions['backend'] = 'QtWebKit-NG (WebKit WEBKIT VERSION)'
else: else:
backend = 'legacy QtWebKit'
patches['qtutils.is_qtwebkit_ng'] = lambda: False patches['qtutils.is_qtwebkit_ng'] = lambda: False
substitutions['backend'] = 'QtWebKit (WebKit WEBKIT VERSION)' substitutions['backend'] = backend + ' (WebKit WEBKIT VERSION)'
else: else:
monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False) monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False)
patches['objects.backend'] = usertypes.Backend.QtWebEngine patches['objects.backend'] = usertypes.Backend.QtWebEngine