From 088e8ea4c871d1704dceed87c4eea2922ccd4da1 Mon Sep 17 00:00:00 2001 From: psi29a Date: Sun, 6 Aug 2023 16:06:28 +0000 Subject: [PATCH] Have macos use Qt5 instead of Qt6 --- CI/before_install.osx.sh | 6 ++++-- CI/before_script.osx.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 68569039b1..ca18179996 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -4,7 +4,7 @@ export HOMEBREW_NO_EMOJI=1 brew uninstall --ignore-dependencies python@3.8 || true brew uninstall --ignore-dependencies python@3.9 || true -brew uninstall --ignore-dependencies qt@5 || true +brew uninstall --ignore-dependencies qt@6 || true brew uninstall --ignore-dependencies jpeg || true brew tap --repair @@ -20,7 +20,9 @@ install_name_tool -change "@loader_path/libbrotlicommon.1.dylib" "${BREW_LIB_PAT 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@6 +command -v qmake >/dev/null 2>&1 || brew install qt@5 +export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" + # Install deps brew install icu4c yaml-cpp sqlite diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 6f3e6b0131..c956f27514 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -8,7 +8,7 @@ git config --global advice.detachedHead false DEPENDENCIES_ROOT="/tmp/openmw-deps" -QT_PATH=$(brew --prefix qt@6) +QT_PATH=$(brew --prefix qt@5) ICU_PATH=$(brew --prefix icu4c) CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache mkdir build