From ac00f94dc592727b15337a1bbf26ab6007a1ca5a Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Fri, 2 Jun 2023 10:19:47 +0200
Subject: [PATCH] Remove old download script and fix openssl on win

---
 Tools/download_qt.py | 49 --------------------------------------------
 Tools/setup.py       |  2 +-
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 Tools/download_qt.py

diff --git a/Tools/download_qt.py b/Tools/download_qt.py
deleted file mode 100644
index d1beb902..00000000
--- a/Tools/download_qt.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/python3
-# SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
-import argparse
-import subprocess
-from platform import platform, system
-from pathlib import Path
-from execute_util import execute
-from sys import stdout
-
-stdout.reconfigure(encoding='utf-8')
-
-def run(cmd, cwd=Path.cwd()):
-	result = subprocess.run(cmd, shell=True, cwd=cwd)
-	if result.returncode != 0:
-		raise RuntimeError(f"Failed to execute {cmd}")
-
-def download_qt():
-    root_path = Path.cwd()
-    qt_version = "6.4.0"
-    qt_installer_version = "4.4"
-    qt_path = " "
-    operating_system =  " "
-    device_type = "desktop"
-    qt_bin = "  "
-    aqt_path =  Path(f"{root_path}/../../aqt/").resolve()
-
-    parser = argparse.ArgumentParser(description='Installs qt')
-    parser.add_argument('--path', help='')
-    args = parser.parse_args()
-
-
-    if system() == "Windows":
-        operating_system = "windows"
-        qt_bin = "win64_msvc2019_64"
-    elif system() == "Darwin":
-        operating_system = "mac"
-        qt_bin = "clang_64"
-    elif system() == "Linux":
-        operating_system = "linux"
-        qt_bin = "gcc_64"
-        
-    print(f"Download destination: {aqt_path} ")
-    run("python3 -m pip install -U pip wheel")
-    run("python3 -m pip install aqtinstall")
-    run(f"python3 -m aqt install-qt -O {aqt_path} {operating_system} {device_type} {qt_version} {qt_bin} -m all")
-    run(f"python3 -m aqt install-tool -O {aqt_path} {operating_system} {device_type} tools_ifw ")
-
-if __name__ == "__main__":
-    download_qt()
diff --git a/Tools/setup.py b/Tools/setup.py
index 4f601642..8823451a 100755
--- a/Tools/setup.py
+++ b/Tools/setup.py
@@ -59,7 +59,7 @@ def download(aqt_path: Path, qt_platform: Path):
     # see:  python -m aqt list-tool windows desktop
     tools = ["tools_ifw", "tools_qtcreator", "tools_ninja" ,"tools_cmake"]
     if system() == "Windows":
-        tools += "tools_opensslv3_x64"
+        tools += ["tools_opensslv3_x64"]
     for tool in tools:
         execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-tool -O {aqt_path} {os} desktop {tool}")