Try conditional install again

Author: dcwhite

.travis.yml

@@ -51,11 +51,9 @@ before_install:
 
 install:
 - 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
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo $(brew --prefix qt); fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls $(brew --prefix qt) || true; fi
+- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
+- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
+- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi
 
 script:
   - cd bin