aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2018-06-19 23:34:03 +0200
committerGerald Combs <gerald@wireshark.org>2018-06-20 21:46:18 +0000
commitc1e5733a2850dd18a699eeb126a628a117052917 (patch)
tree0beca6f55b9008326449f7fdf2e59980c23724c6 /.travis.yml
parent1600a7d9f8d5ec51336b3dbd83850756565eb6ca (diff)
travis: remove unnecessary qt5 in PATH for macOS
Since v2.5.0rc0-1101-ged15895221 ("cmake: look for Qt5 from Homebrew on macOS"), qt5 no longer needs to be in the PATH. Change-Id: I1edadcb0eec8a38c4f7364353e57f92c80ca400f Reviewed-on: https://code.wireshark.org/review/28352 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 620db03d3d..b21592cc0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ before_install:
- echo $TRAVIS_OS_NAME
# macos
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
- - if [ "$TRAVIS_OS_NAME" == "osx" ]; then PATH=/usr/local/opt/qt5/bin:$PATH; fi
# linux
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8"; fi ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi