change to qt5 on macOS

skvark · skvark · commit 2e02b3bd0465 · 2020-02-01T22:15:44.000+02:00
diff --git a/travis_config.sh b/travis_config.sh
@@ -96,19 +96,20 @@ 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'
 
     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
 
