Fix ninja install

Author: dcwhite

.travis.yml

@@ -51,9 +51,10 @@ 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 brew install ninja; 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
+- 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

scripts/getQt4Mac.sh

@@ -3,4 +3,4 @@
 brew tap cartr/qt4 || true
 brew tap cartr/qt4
 brew tap-pin cartr/qt4
-brew install cartr/qt4/qt ninja
+brew install cartr/qt4/qt