Merge #2911: [GA] Use new versioned qt@5 homebrew package name

9e6d17b [GA] Use new versioned qt@5 homebrew package name (Fuzzbawls)

Pull request description:

  Homebrew recently removed the legacy symlinks for the `qt5` package and is now only using the versioned `qt@5` naming. Adjust accordingly.

ACKs for top commit: 9e6d17b
  panleone:
    tACK 9e6d17b
  Liquid369:
    tACK 9e6d17b

Tree-SHA512: e3a1f499326afc5bde8b60e49709c58ddbf3d86f7316730b6884e049b35f6f5ecdaa726339baf2aeb671abb14a1d13a6e78870a7dc9d8b48e1427571ccbc3a41

.github/workflows/build-and-test.yml

@@ -97,7 +97,7 @@ jobs:
 
  - name: macOS-latest
  os: macos-latest
- packages: llvm@13 [email protected] autoconf automake berkeley-db@4 libtool [email protected] miniupnpc libnatpmp pkg-config qt5 zmq libevent qrencode gmp libsodium rust
+ packages: llvm@13 [email protected] autoconf automake berkeley-db@4 libtool [email protected] miniupnpc libnatpmp pkg-config qt@5 zmq libevent qrencode gmp libsodium rust
  boost_root: true
  cc: $(brew --prefix llvm@13)/bin/clang
  cxx: $(brew --prefix llvm@13)/bin/clang++
@@ -199,7 +199,7 @@ jobs:
  - name: x64-macOS-latest
  id: macOS-nodepends-latest
  os: macos-latest
- brew_install: autoconf automake ccache berkeley-db@4 libtool [email protected] miniupnpc libnatpmp pkg-config [email protected] qt5 zmq libevent qrencode gmp libsodium rust librsvg
+ brew_install: autoconf automake ccache berkeley-db@4 libtool [email protected] miniupnpc libnatpmp pkg-config [email protected] qt@5 zmq libevent qrencode gmp libsodium rust librsvg
  unit_tests: true
  functional_tests: true
  goal: deploy

CMakeLists.txt

@@ -38,7 +38,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(ENV{target} "Mac")
  add_definitions("-DMAC_OSX")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D'NS_FORMAT_ARGUMENT\(A\)='")
- list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/qt5 /opt/homebrew/opt/qt5)
+ list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/qt5 /usr/local/opt/qt@5 /opt/homebrew/opt/qt5 /opt/homebrew/opt/qt@5)
  list(APPEND CMAKE_PREFIX_PATH /usr/local/Cellar/berkeley-db@4 /opt/homebrew/Cellar/berkeley-db@4)
  # Homebrew default path for apple silicon CPUs is different than for intel CPUs
  if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm")

doc/build-osx.md

@@ -16,7 +16,7 @@ Then install [Homebrew](https://brew.sh).
 Dependencies
 ----------------------
 
- brew install autoconf automake berkeley-db4 libtool boost miniupnpc libnatpmp pkg-config python3 qt5 zmq libevent qrencode gmp libsodium rust
+ brew install autoconf automake berkeley-db4 libtool boost miniupnpc libnatpmp pkg-config python3 qt@5 zmq libevent qrencode gmp libsodium rust
 
 See [dependencies.md](dependencies.md) for a complete overview.