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

fix: installation of android for Qt 6.8.0 (#801)

Browse Source 
* fix: installation of android for Qt 6.8.0

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

* style: wrap a long line

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

* style: apply black

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

---------

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2024-07-02 12:20:58 +09:00
committed by GitHub
parent ac7da38299
commit 649c55ed46
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
aqt/archives.py
View File

@@ -362,7 +362,14 @@ class QtArchives:
return target_packages return target_packages
def _get_archives(self): def _get_archives(self):
self._get_archives_base(f"qt{self.version.major}_{self._version_str()}{self._arch_ext()}", self._target_packages()) if self.version >= Version("6.8.0"):
name = (
f"qt{self.version.major}_{self._version_str()}"
f"/qt{self.version.major}_{self._version_str()}{self._arch_ext()}"
)
else:
name = f"qt{self.version.major}_{self._version_str()}{self._arch_ext()}"
self._get_archives_base(name, self._target_packages())
def _append_depends_tool(self, arch, tool_name): def _append_depends_tool(self, arch, tool_name):
os_target_folder = posixpath.join( os_target_folder = posixpath.join(
@@ -378,29 +385,19 @@ class QtArchives:
def _get_archives_base(self, name, target_packages): def _get_archives_base(self, name, target_packages):
os_name = self.os_name os_name = self.os_name
if self.target == "android" and self.version >= Version("6.7.0"):
os_name = "all_os"
if self.os_name == "windows": if self.os_name == "windows":
os_name += "_x86" os_name += "_x86"
elif os_name != "linux_arm64" and os_name != "all_os" and os_name != "windows_arm64": elif os_name != "linux_arm64" and os_name != "all_os" and os_name != "windows_arm64":
os_name += "_x64" os_name += "_x64"
if self.target == "android" and self.version >= Version("6.7.0"): os_target_folder = posixpath.join(
os_name = "all_os" "online/qtsdkrepository",
# os_name,
if os_name in ("windows_x86", "windows_arm64") and self.version >= Version("6.8.0"): self.target,
os_target_folder = posixpath.join( # tools_ifw/
"online/qtsdkrepository", name,
os_name, )
self.target,
name,
name,
)
else:
os_target_folder = posixpath.join(
"online/qtsdkrepository",
os_name,
self.target,
# tools_ifw/
name,
)
update_xml_url = posixpath.join(os_target_folder, "Updates.xml") update_xml_url = posixpath.join(os_target_folder, "Updates.xml")
update_xml_text = self._download_update_xml(update_xml_url) update_xml_text = self._download_update_xml(update_xml_url)
self._parse_update_xml(os_target_folder, update_xml_text, target_packages) self._parse_update_xml(os_target_folder, update_xml_text, target_packages)