summaryrefslogtreecommitdiff
path: root/qutebrowser
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-04-15 09:00:59 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-04-15 09:00:59 +0200
commit7ce827749cc0e41bf5783030ef660270c2e5932c (patch)
tree961e85b1c89341b2a9aea025f662d127efe5d657 /qutebrowser
parent6b3e7c2ca8710f7425e68790a1351e32ee1e2e29 (diff)
downloadqutebrowser-7ce827749cc0e41bf5783030ef660270c2e5932c.tar.gz
qutebrowser-7ce827749cc0e41bf5783030ef660270c2e5932c.zip
Revert accidental version.py changes
Diffstat (limited to 'qutebrowser')
-rw-r--r--qutebrowser/utils/version.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index f5bc5eab2..2bac125ed 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -710,7 +710,7 @@ class WebEngineVersions:
)
@classmethod
- def from_qt(cls, qt_version: str, *, source: str = 'Qt') -> 'WebEngineVersions':
+ def from_qt(cls, qt_version: str) -> 'WebEngineVersions':
"""Get the versions based on the Qt version.
This is called if we don't have PYQT_WEBENGINE_VERSION, i.e. with PyQt 5.12.
@@ -719,7 +719,7 @@ class WebEngineVersions:
return cls(
webengine=parsed,
chromium=cls._infer_chromium_version(parsed),
- source=source,
+ source='Qt',
)
@@ -750,10 +750,6 @@ def qtwebengine_versions(avoid_init: bool = False) -> WebEngineVersions:
if webenginesettings.parsed_user_agent is not None:
return WebEngineVersions.from_ua(webenginesettings.parsed_user_agent)
- override = os.environ.get('QUTE_QTWEBENGINE_VERSION_OVERRIDE')
- if override is not None:
- return WebEngineVersions.from_qt(override, source='override')
-
versions = elf.parse_webenginecore()
if versions is not None:
return WebEngineVersions.from_elf(versions)