diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-03-11 12:27:25 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-03-11 14:17:19 +0100 |
commit | 1678cd67a4a0360eb3bc914b46f137d383467893 (patch) | |
tree | f1cc9da714064053350f58f218cdd581638cd64b /qutebrowser/utils | |
parent | 69101796d5f02a95f5d75ed134cd51d92e8aeb0a (diff) | |
download | qutebrowser-1678cd67a4a0360eb3bc914b46f137d383467893.tar.gz qutebrowser-1678cd67a4a0360eb3bc914b46f137d383467893.zip |
Fix Chromium version handling with PyQt 5.15.4+
Diffstat (limited to 'qutebrowser/utils')
-rw-r--r-- | qutebrowser/utils/version.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index a741a3584..e61d18448 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -611,11 +611,20 @@ class WebEngineVersions: chromium_version = cls._CHROMIUM_VERSIONS.get(pyqt_webengine_version) if chromium_version is not None: return chromium_version - # 5.14.2 -> 5.14 - minor_version = utils.VersionNumber( - pyqt_webengine_version.majorVersion(), - pyqt_webengine_version.minorVersion(), - ) + + # 5.15 patch versions change their QtWebEngine version, but no changes are + # expected after 5.15.3. + v5_15_3 = utils.VersionNumber(5, 15, 3) + if v5_15_3 <= pyqt_webengine_version < utils.VersionNumber(6): + minor_version = v5_15_3 + else: + # e.g. 5.14.2 -> 5.14 + segments = pyqt_webengine_version.segments()[:2] + if segments[-1] == 0: + del segments[-1] + + minor_version = utils.VersionNumber(*segments) + return cls._CHROMIUM_VERSIONS.get(minor_version) @classmethod |