From 78582d12d399b72a492a7812e968c1ea2a58a2ca Mon Sep 17 00:00:00 2001
From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
Date: Fri, 18 Dec 2020 10:59:20 +0300
Subject: [PATCH] SYNERGY-652 Avoid using brew for macOS build (#6882)

* SYNERGY-652 Avoid using brew for macOS build

* Update ChangeLog
---
 CI/MacOS/mac-build.yml | 19 ++++++++++---------
 ChangeLog              |  1 +
 azure-pipelines.yml    |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml
index 2ea412463..f8e54677c 100644
--- a/CI/MacOS/mac-build.yml
+++ b/CI/MacOS/mac-build.yml
@@ -6,22 +6,23 @@ steps:
       keychain: 'temp'
     condition: eq(variables['Build.Reason'], 'Manual')
 
+  - task: CmdLine@2
+    inputs:
+      script: | 
+        python3 -m pip install dmgbuild
+        python3 -m pip install aqtinstall
+    displayName: 'Installing utilities'
+
   - task: CmdLine@2
     inputs:
       script: |
-        export HOMEBREW_NO_INSTALL_CLEANUP=1
-        brew install qt
+        python3 -m aqt install $(QT_VERSION) mac desktop -O $(QT_PATH)
     displayName: 'Installing QT'
 
-  - task: CmdLine@2
-    inputs:
-      script: 'python3 -m pip install dmgbuild'
-    displayName: 'Installing dmgbuild'
-
   - task: CmdLine@2
     inputs:
       script: |
-        export PATH="$(QT_PATH):$PATH"
+        export PATH="$(Qt5_DIR)/bin:$PATH"
         mkdir build
         cd build
         cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=$(version) -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release ..
@@ -33,7 +34,7 @@ steps:
   - task: CmdLine@2
     inputs:
       script: |
-        export PATH="$(QT_PATH):$PATH"
+        export PATH="$(Qt5_DIR)/bin:$PATH"
         export SYNERGY_ENTERPRISE=1
         mkdir build
         cd build
diff --git a/ChangeLog b/ChangeLog
index 362e2c17a..500b137f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Bug fixes:
 - #6874 The logo on Windows taskbar is incorrect.
 - #6879 Update macOS installer drive icons
 - #6878 Update googletest library to latest version
+- #6882 Build macOS using qt 5.15.2 and avoid using brew for build
 
 Enhancements:
 - #6867 Create only 1 artefact for macOS
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 24b5d394a..ed6101b9d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -85,7 +85,9 @@ jobs:
     condition: eq(variables['Build.Reason'], 'Manual')
 
     variables:
-      QT_PATH: '/usr/local/opt/qt/bin'
+      QT_VERSION: '5.15.2'
+      QT_PATH: '/usr/local/opt/qt'
+      Qt5_DIR: '$(QT_PATH)/$(QT_VERSION)/clang_64'
 
     steps:
       - template: CI/checkout.yml