Skip to content

Commit bcf76c8

Browse files
committed
Update .travis.yml
1 parent 30f077d commit bcf76c8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ before_install:
5050
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then uname -a; fi
5151

5252
install:
53-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
54-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
53+
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
54+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev; fi
5555
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
56+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
5657
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
5758
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi
5859

0 commit comments

Comments
 (0)