Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2e02b3b

Browse filesBrowse files
committed
change to qt5 on macOS
1 parent 625ee63 commit 2e02b3b
Copy full SHA for 2e02b3b

File tree

Expand file treeCollapse file tree

1 file changed

+5
-4
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-4
lines changed

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,20 @@ function pre_build {
9696
brew_add_local_bottles
9797
fi
9898

99-
echo 'Installing QT4'
100-
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
99+
echo 'Installing qt5'
101100
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; }
103102
else
104-
brew install cartr/qt4/qt@4
103+
brew install qt5
104+
export PATH="/usr/local/opt/qt/bin:$PATH"
105105
fi
106106

107107
echo 'Installing FFmpeg'
108108

109109
if [ -n "$CACHE_STAGE" ]; then
110110
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
111111
else
112+
brew unlink python@2
112113
brew install ffmpeg_opencv
113114
fi
114115

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.