File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed
Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -50,9 +50,10 @@ before_install:
5050- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then uname -a; fi
5151
5252install :
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
You can’t perform that action at this time.
0 commit comments