Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 13:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for qt 6.5.0 wasm

Browse Source
This commit is contained in:
Dave Dalcino
2023-02-06 16:51:16 -08:00
parent 42bb9d4d0a
commit dc9c1e6798
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
aqt/metadata.py
View File

@@ -246,6 +246,8 @@ class ArchiveId:
def all_extensions(self, version: Version) -> List[str]: def all_extensions(self, version: Version) -> List[str]:
if self.target == "desktop" and QtRepoProperty.is_in_wasm_range(self.host, version): if self.target == "desktop" and QtRepoProperty.is_in_wasm_range(self.host, version):
return ["", "wasm"] return ["", "wasm"]
elif self.target == "desktop" and QtRepoProperty.is_in_wasm_threaded_range(version):
return ["", "wasm_singlethread", "wasm_multithread"]
elif self.target == "android" and version >= Version("6.0.0"): elif self.target == "android" and version >= Version("6.0.0"):
return list(ArchiveId.EXTENSIONS_REQUIRED_ANDROID_QT6) return list(ArchiveId.EXTENSIONS_REQUIRED_ANDROID_QT6)
else: else:
@@ -400,6 +402,10 @@ class QtRepoProperty:
def extension_for_arch(architecture: str, is_version_ge_6: bool) -> str: def extension_for_arch(architecture: str, is_version_ge_6: bool) -> str:
if architecture == "wasm_32": if architecture == "wasm_32":
return "wasm" return "wasm"
elif architecture == "wasm_singlethread":
return "wasm_singlethread"
elif architecture == "wasm_multithread":
return "wasm_multithread"
elif architecture.startswith("android_") and is_version_ge_6: elif architecture.startswith("android_") and is_version_ge_6:
ext = architecture[len("android_") :] ext = architecture[len("android_") :]
if ext in ArchiveId.EXTENSIONS_REQUIRED_ANDROID_QT6: if ext in ArchiveId.EXTENSIONS_REQUIRED_ANDROID_QT6:
@@ -483,11 +489,15 @@ class QtRepoProperty:
@staticmethod @staticmethod
def is_in_wasm_range(host: str, version: Version) -> bool: def is_in_wasm_range(host: str, version: Version) -> bool:
return ( return (
version in SimpleSpec(">=6.2.0") version in SimpleSpec(">=6.2.0,<6.5.0")
or (host == "linux" and version in SimpleSpec(">=5.13,<6")) or (host == "linux" and version in SimpleSpec(">=5.13,<6"))
or version in SimpleSpec(">=5.13.1,<6") or version in SimpleSpec(">=5.13.1,<6")
) )
@staticmethod
def is_in_wasm_threaded_range(version: Version) -> bool:
return version in SimpleSpec(">=6.5.0")
class MetadataFactory: class MetadataFactory:
"""Retrieve metadata of Qt variations, versions, and descriptions from Qt site.""" """Retrieve metadata of Qt variations, versions, and descriptions from Qt site."""

2
aqt/updater.py
View File

@@ -282,6 +282,8 @@ class Updater:
"ios", "ios",
"android", "android",
"wasm_32", "wasm_32",
"wasm_singlethread",
"wasm_multithread",
"android_x86_64", "android_x86_64",
"android_arm64_v8a", "android_arm64_v8a",
"android_x86", "android_x86",