From 27fb2b33399c5b2a08e7618329e92447f13bb3e1 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 16 May 2023 20:55:21 +0200
Subject: [PATCH 1/2] Add support for standalone sdktool installation

This allows us to install sdktool using the following command:
aqt install-tool windows desktop sdktool
---
 aqt/metadata.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/aqt/metadata.py b/aqt/metadata.py
index b4f32e44..64a98b21 100644
--- a/aqt/metadata.py
+++ b/aqt/metadata.py
@@ -543,7 +543,10 @@ def __init__(
 
         if archive_id.is_tools():
             if tool_name is not None:
-                _tool_name: str = "tools_" + tool_name if not tool_name.startswith("tools_") else tool_name
+                if not tool_name.startswith("tools_") and tool_name != "sdktool":
+                    _tool_name = f"tools_{tool_name}"
+                else:
+                    _tool_name = tool_name
                 if is_long_listing:
                     self.request_type = "tool long listing"
                     self._action: MetadataFactory.Action = lambda: self.fetch_tool_long_listing(_tool_name)
@@ -733,6 +736,8 @@ def link_to_folder(link: bs4.element.Tag) -> str:
                     continue
                 if folder.startswith(filter_category):
                     yield folder
+                if filter_category == "tools" and folder == "sdktool":
+                    yield folder
         except Exception as e:
             raise ArchiveConnectionError(
                 f"Failed to retrieve the expected HTML page at {html_url}",

From 66940df150cc8ffd8a3fb610b9fdac78db173101 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Wed, 17 May 2023 09:30:38 +0200
Subject: [PATCH 2/2] Update aqt/combinations.json

---
 aqt/combinations.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/aqt/combinations.json b/aqt/combinations.json
index 27d0e994..e3d7ef64 100644
--- a/aqt/combinations.json
+++ b/aqt/combinations.json
@@ -546,6 +546,12 @@
       }
     ],
     "tools": [
+      {
+        "arch": "qt.tools.qtcreator",
+        "os_name": "linux",
+        "target": "desktop",
+        "tool_name": "sdktool"
+      },
       {
         "arch": "qt.tools.cmake",
         "os_name": "linux",
@@ -684,6 +690,12 @@
         "target": "desktop",
         "tool_name": "tools_telemetry_gui"
       },
+      {
+        "arch": "qt.tools.qtcreator",
+        "os_name": "mac",
+        "target": "desktop",
+        "tool_name": "sdktool"
+      },
       {
         "arch": "qt.tools.cmake",
         "os_name": "mac",
@@ -792,6 +804,12 @@
         "target": "desktop",
         "tool_name": "tools_telemetry_gui"
       },
+      {
+        "arch": "qt.tools.qtcreator",
+        "os_name": "windows",
+        "target": "desktop",
+        "tool_name": "sdktool"
+      },
       {
         "arch": "qt.tools.cmake",
         "os_name": "windows",