From 6d89ae1a751aa729a734d68370e48d45721b08ea Mon Sep 17 00:00:00 2001 From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com> Date: Sat, 14 Jun 2025 16:09:07 -0500 Subject: [PATCH] [CI] Mac - use qt@6 --- CI/before_install.osx.sh | 4 ++-- CI/before_script.osx.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index d73399c102..a8fe3d094a 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -11,8 +11,8 @@ brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake -command -v qmake >/dev/null 2>&1 || brew install qt@5 -export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" +command -v qmake >/dev/null 2>&1 || brew install qt@6 +export PATH="/opt/homebrew/opt/qt@6/bin:$PATH" # Install deps brew install openal-soft icu4c yaml-cpp sqlite diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 9f7a5bde8f..9be91f1632 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -9,7 +9,7 @@ cd build DEPENDENCIES_ROOT="/tmp/openmw-deps" -QT_PATH=$(brew --prefix qt@5) +QT_PATH=$(brew --prefix qt@6) ICU_PATH=$(brew --prefix icu4c) OPENAL_PATH=$(brew --prefix openal-soft) CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache