summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2017-04-18 22:42:30 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2017-04-18 23:25:46 +0200
commit69680ab8798d90ffb4373857e0404b5e56b5bab1 (patch)
tree0a0b99870e9019d5b72c64c97cf09c2a041b538a /.travis.yml
parent51791c7fa162e4bb50476cf9098eb051812733f7 (diff)
parentbf5e71f24a57a059ec8f9efc1c9de1354cb866bb (diff)
Merge remote-tracking branch 'upstream/master' into lv2_support
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 5c2426ae67..15473dd39c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,8 +65,8 @@ install:
####
# OS X Build
- # Define QTDIR.
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1) ; fi
+ # Define QTDIR. Homebrew does not support Qt4 anymore, so /usr/local/Cellar/qt stores Qt5 installs.
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1) ; fi
# Workaround for bug in libopus's opus.h including <opus_multistream.h>
# instead of <opus/opus_multistream.h>.