From 3d19f575c0d503999f30b562113d17cee9cfad1d Mon Sep 17 00:00:00 2001
From: Christian Rauch <Rauch.Christian@gmx.de>
Date: Sat, 1 Jun 2024 09:26:20 +0200
Subject: [PATCH 1/3] switch to macOS 14 runners

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94e5f0a7..3f880752 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
         config:
           - { name: "Linux", os: ubuntu-20.04 }
           - { name: "Windows", os: windows-latest }
-          - { name: "macOS", os: macos-13 }
+          - { name: "macOS", os: macos-14 }
     steps:
       - uses: actions/checkout@v4
 

From e5d741269e28aead5f25e47c0bdd50053cb5b0b6 Mon Sep 17 00:00:00 2001
From: Christian Rauch <Rauch.Christian@gmx.de>
Date: Sat, 1 Jun 2024 09:55:51 +0200
Subject: [PATCH 2/3] universal binary for macOS

---
 setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup.py b/setup.py
index 88ada3df..f3bb262b 100755
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@
     "i686": "x86",
     "x86": "x86",
     "x86_64": "x64",
+    "x64": "x64",
     "AMD64": "x64",
     "aarch64": "arm64",
 }
@@ -225,6 +226,10 @@ def qt_download_check_extract(cfg, dir_install):
     cfg['os'] = platform.system()
     cfg['arch'] = platform.machine()
 
+    # macOS uses a universal binary that stores all architectures in the "x64" folder
+    if cfg['os'] == "Darwin":
+        cfg['arch'] = "x64"
+
     with open("versions.yaml", 'r') as file:
         cfg['versions'] = yaml.safe_load(file)
 

From ff9cf3df133d0b45a6b5b21695853e5aeaee4156 Mon Sep 17 00:00:00 2001
From: Christian Rauch <Rauch.Christian@gmx.de>
Date: Sat, 1 Jun 2024 10:12:41 +0200
Subject: [PATCH 3/3] fall back to tqdm if tqdm-loggable is not available

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f3bb262b..63b9dc9f 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,10 @@
 import py7zr
 import requests
 import yaml
-from tqdm_loggable.auto import tqdm
+try:
+    from tqdm_loggable.auto import tqdm
+except ModuleNotFoundError:
+    from tqdm import tqdm
 
 
 url_repo_qtc_fmt = "https://download.qt.io/{release_type}_releases/qtcreator/{qtcv_maj}/{qtcv_full}/installer_source/{os}_{arch}/"