From 740bee0faf8c5d129df2371ef019f31d96f155b2 Mon Sep 17 00:00:00 2001 From: gcoco Date: Sat, 2 Apr 2016 17:36:41 -0400 Subject: [PATCH] Fix QT install. Allows sub-version so we can do QT5.5.1 (Webkit) and QT5.6 (Webengine) at a later date. --- travis/install-qt.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/travis/install-qt.sh b/travis/install-qt.sh index e176a9c80..629f8cf65 100644 --- a/travis/install-qt.sh +++ b/travis/install-qt.sh @@ -1,15 +1,9 @@ #!/bin/bash echo "QT=>" "$QT" "<=" -if [ "$QT" = "qt5" ] +#!/bin/bash +if [ "$QT_VER" = "5.5.1" ] then - pwd - workdir=`pwd` - echo ${workdir} - cd $( brew --prefix ) - pwd - # Select QT 5.5.1 - git checkout fb64f6cd91ff Library/Formula/qt5.rb - cd ${workdir} - pwd + brew install https://raw.githubusercontent.com/Homebrew/homebrew/fb64f6cd91ff19d9c651b7851a74808bde6bc60f/Library/Formula/qt5.rb +else + brew install $QT fi -brew install $QT