Merge pull request #1207 from tom-tan/fix-qt5-path

Fix osx_environment.sh for Homebrew

dist/macos/bundle/build_dist.sh.in

@@ -48,7 +48,7 @@ fi
 # Check for macdeployqt on Homebrew
 if which -s brew ; then
     info "Homebrew found, searching for macdeployqt"
-    DEPLOYQT="$(brew list qt | grep --only '/.*macdeployqt' | head -1)"
+    DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)"
     if [ ! -x "$DEPLOYQT" ]; then
         error Please install package qt
         exit 1
@@ -70,4 +70,4 @@ else
     -executable="$B_BARRIERC" \
     -executable="$B_BARRIERS" || exit 1
     success "Bundle created successfully"
-fi
+fi

osx_environment.sh

@@ -29,7 +29,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then
 
     elif command -v brew; then
         printf "Detected Homebrew\n"
-        QT_PATH=$(brew --prefix qt)
+        QT_PATH=$(brew --prefix qt@5)
         OPENSSL_PATH=$(brew --prefix openssl)
 
         check_dir_exists "$QT_PATH" 'qt'