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

qt4 install

上级 63cdb56a
...@@ -23,11 +23,10 @@ function pre_build { ...@@ -23,11 +23,10 @@ function pre_build {
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
echo "Running for OSX" echo "Running for OSX"
# For some reason, gt@4 and ffmpeg can be preinstalled in Travis Mac env
echo 'Installing QT4' echo 'Installing QT4'
brew tap | grep -qxF cartr/qt4 || brew tap -v cartr/qt4 brew tap cartr/qt4
brew tap --list-pinned | grep -qxF cartr/qt4 || brew tap-pin -v cartr/qt4 brew tap-pin cartr/qt4
brew list --versions qt@4 || brew install -v qt@4 brew install qt@4
echo '-----------------' echo '-----------------'
echo 'Installing FFmpeg' echo 'Installing FFmpeg'
# brew install does produce output regularly on a regular MacOS, # brew install does produce output regularly on a regular MacOS,
...@@ -39,7 +38,7 @@ function pre_build { ...@@ -39,7 +38,7 @@ function pre_build {
else else
echo "Running for linux" echo "Running for linux"
fi fi
qmake -query qmake -query
} }
function run_tests { function run_tests {
...@@ -54,7 +53,7 @@ function run_tests { ...@@ -54,7 +53,7 @@ function run_tests {
echo "Running for linux" echo "Running for linux"
cd /io/tests/ cd /io/tests/
fi fi
test_wheels test_wheels
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册