From e80184ce7ac6e889e9ed51a4342688f8f42cc6c4 Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Tue, 22 Jun 2021 23:24:36 +0900 Subject: [PATCH 1/2] Fix osx_environment.sh for Homebrew --- osx_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx_environment.sh b/osx_environment.sh index 09fa3479..0c725fb1 100644 --- a/osx_environment.sh +++ b/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' From ac5de110c0941e3a2da1f2cd0b7ade4fa26c9bdf Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Wed, 23 Jun 2021 01:05:58 +0900 Subject: [PATCH 2/2] Update build_dist.sh.in --- dist/macos/bundle/build_dist.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/macos/bundle/build_dist.sh.in b/dist/macos/bundle/build_dist.sh.in index c96da790..3d5c333f 100755 --- a/dist/macos/bundle/build_dist.sh.in +++ b/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 \ No newline at end of file +fi