summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-06-15 09:49:30 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-06-22 17:41:12 +0200
commit1a061b92076ee022aac643c326e8d37dff903fa6 (patch)
tree0e592061ca0cf4df32429db56732063c07b31328
parenta7a1654f1c55d8f312473ca59966cea1e96bbeaa (diff)
downloadqutebrowser-1a061b92076ee022aac643c326e8d37dff903fa6.tar.gz
qutebrowser-1a061b92076ee022aac643c326e8d37dff903fa6.zip
scripts: Add _is_qt6_version to mkvenv
-rwxr-xr-xscripts/mkvenv.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index e31ceb790..faee6f58f 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -137,6 +137,12 @@ def pyqt_versions() -> List[str]:
return versions + ['auto']
+def _is_qt6_version(version: str) -> bool:
+ """Check if the given version is Qt 6."""
+ # FIXME:qt6 Adjust once auto = Qt 6
+ return version == "6" or version.startswith("6.")
+
+
def run_venv(
venv_dir: pathlib.Path,
executable,
@@ -303,7 +309,7 @@ def apply_xcb_util_workaround(
if pyqt_type != 'binary':
print("Workaround not needed: Not installing from PyQt binaries.")
return
- if pyqt_version not in ['auto', '5.15', '5']: # FIXME:qt6 Remove once auto = Qt 6
+ if _is_qt6_version(pyqt_version):
print("Workaround not needed: Not installing Qt 5.15.")
return