File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed
Filter options
Expand file tree Collapse file tree 1 file changed +5
-4
lines changed
Original file line number Diff line number Diff line change @@ -96,19 +96,20 @@ function pre_build {
96
96
brew_add_local_bottles
97
97
fi
98
98
99
- echo ' Installing QT4'
100
- brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
99
+ echo ' Installing qt5'
101
100
if [ -n " $CACHE_STAGE " ]; then
102
- brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
101
+ brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }
103
102
else
104
- brew install cartr/qt4/qt@4
103
+ brew install qt5
104
+ export PATH=" /usr/local/opt/qt/bin:$PATH "
105
105
fi
106
106
107
107
echo ' Installing FFmpeg'
108
108
109
109
if [ -n " $CACHE_STAGE " ]; then
110
110
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
111
111
else
112
+ brew unlink python@2
112
113
brew install ffmpeg_opencv
113
114
fi
114
115
You can’t perform that action at this time.
0 commit comments