diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-06-24 00:06:26 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-06-30 19:29:28 +0200 |
commit | 0ac074575d17bd35c5988527a5f1238039794436 (patch) | |
tree | 2dcb8d2b3362e4cad7cbed666e503f196cb02627 /scripts | |
parent | 929bbff4ca51f617e17498856c052ab712427e76 (diff) | |
download | qutebrowser-0ac074575d17bd35c5988527a5f1238039794436.tar.gz qutebrowser-0ac074575d17bd35c5988527a5f1238039794436.zip |
qt 6: Update mkvenv.py for Qt 6 by default
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/mkvenv.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py index 625cedd1a..5f52792c6 100755 --- a/scripts/mkvenv.py +++ b/scripts/mkvenv.py @@ -134,8 +134,7 @@ def pyqt_versions() -> List[str]: 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.") + return version in ["auto", "6"] or version.startswith("6.") def run_venv( @@ -228,7 +227,7 @@ def requirements_file(name: str) -> pathlib.Path: def pyqt_requirements_file(version: str) -> pathlib.Path: """Get the filename of the requirements file for the given PyQt version.""" - name = 'pyqt' if version == 'auto' else 'pyqt-{}'.format(version) + name = 'pyqt-6' if version == 'auto' else f'pyqt-{version}' return requirements_file(name) @@ -439,7 +438,7 @@ def run_qt_smoke_test_single( def run_qt_smoke_test(venv_dir: pathlib.Path, *, pyqt_version: str) -> None: """Make sure the Qt installation works.""" # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-104415 - no_debug = pyqt_version in ("6.3", "6") and sys.platform == "darwin" + no_debug = pyqt_version == "6.3" and sys.platform == "darwin" if no_debug: try: run_qt_smoke_test_single(venv_dir, debug=False, pyqt_version=pyqt_version) |