Try aqt Qt

Author: Koi-3088

SerialPrograms/azure-pipelines.yml

@@ -14,11 +14,6 @@ resources:
       name: PokemonAutomation/Packages
       endpoint: Koi-3088
       ref: refs/heads/master
-    - repository: macdeployqtfix
-      type: github
-      name: arl/macdeployqtfix
-      endpoint: Koi-3088
-      ref: refs/heads/master
 
 parameters:
   - name: buildType
@@ -307,7 +302,7 @@ jobs:
         qt_version_major: '6'
         qt_modules: 'qtserialport qtmultimedia'
         cmake_preset: 'RelWithDebInfo'
-        macos_path: '/opt/homebrew/opt/qt/lib/cmake:/opt/homebrew/opt/qt/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew:$PATH'
+        macos_path: '/opt/Qt/6.9.3/macos/lib/cmake:/opt/Qt/6.9.3/macos/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew:$PATH'
         cmake_additional_param: '-DPACKAGE_BUILD=true -DUNIX_LINK_TESSERACT:BOOL=true'
 
       x86_64:
@@ -320,7 +315,7 @@ jobs:
         qt_version_major: '6'
         qt_modules: 'qtserialport qtmultimedia'
         cmake_preset: 'RelWithDebInfo'
-        macos_path: '/usr/local/opt/qt/lib/cmake:/usr/local/opt/qt/bin:/usr/local/opt:/usr/local/bin:/usr/local/sbin:/usr/local:$PATH'
+        macos_path: '/usr/local/Qt/6.9.3/macos/lib/cmake:/usr/local/Qt/6.9.3/macos/bin:/usr/local/opt:/usr/local/bin:/usr/local/sbin:/usr/local:$PATH'
         cmake_additional_param: '-DPACKAGE_BUILD=true -DUNIX_LINK_TESSERACT:BOOL=true'
 
   pool:
@@ -340,12 +335,6 @@ jobs:
       persistCredentials: true
       clean: false
 
-    - checkout: macdeployqtfix
-      path: Arduino-Source/macdeployqtfix
-      submodules: recursive
-      persistCredentials: true
-      clean: false
-
     - script: |
         export PATH=$(macos_path)
         cd "$(Pipeline.Workspace)/Arduino-Source/SerialPrograms"
@@ -372,11 +361,11 @@ jobs:
         if [ $(architecture) = "X64" ]; then
             echo "Using Intel Homebrew and Qt..."
             BREW_PREFIX=$(/usr/local/bin/brew --prefix)
-            QT_BIN="$BREW_PREFIX/opt/qt/bin"
+            QT_BIN="$BREW_PREFIX/Qt/6.9.3/macos/bin"
         else
             echo "Using ARM64 Homebrew and Qt..."
             BREW_PREFIX=$(/opt/homebrew/bin/brew --prefix)
-            QT_BIN="$BREW_PREFIX/opt/qt/bin"
+            QT_BIN="$BREW_PREFIX/Qt/6.9.3/macos/bin"
         fi
 
         echo "=== Running Macdeployqt ==="
@@ -386,27 +375,6 @@ jobs:
       displayName: 'Run macdeployqt'
       condition: succeeded()
 
-    - bash: |
-        set -e
-        echo "=== Running macdeployqtfix for MacOS $(architecture) ==="
-        export PATH=$(macos_path)
-        APP_DIR="$(Pipeline.Workspace)/Arduino-Source/build/$(cmake_preset)/SerialPrograms.app"
-        MACOS_DIR="$APP_DIR/Contents/MacOS"
-
-        if [ $(architecture) = "X64" ]; then
-            echo "Using Intel Homebrew and Qt..."
-            BREW_PREFIX=$(/usr/local/bin/brew --prefix)
-            QT_DIR="$BREW_PREFIX/opt/qt/"
-        else
-            echo "Using ARM64 Homebrew and Qt..."
-            BREW_PREFIX=$(/opt/homebrew/bin/brew --prefix)
-            QT_DIR="$BREW_PREFIX/opt/qt/"
-        fi
-
-        python3 "$(Pipeline.Workspace)/Arduino-Source/macdeployqtfix/macdeployqtfix.py" $MACOS_DIR/SerialPrograms $QT_DIR -v
-      displayName: 'Run macdeployqtfix'
-      condition: succeeded()
-
     - bash: |
         set -euo pipefail
         echo "=== Fixing the app bundle ==="