提交 2e02b3bd 编写于 作者: O Olli-Pekka Heinisuo

change to qt5 on macOS

上级 625ee630
......@@ -96,12 +96,12 @@ function pre_build {
brew_add_local_bottles
fi
echo 'Installing QT4'
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
echo 'Installing qt5'
if [ -n "$CACHE_STAGE" ]; then
brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }
else
brew install cartr/qt4/qt@4
brew install qt5
export PATH="/usr/local/opt/qt/bin:$PATH"
fi
echo 'Installing FFmpeg'
......@@ -109,6 +109,7 @@ function pre_build {
if [ -n "$CACHE_STAGE" ]; then
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
else
brew unlink python@2
brew install ffmpeg_opencv
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册