From 355dad9c2546efc9b6f571939572236e95a5dd6d Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Sat, 11 Jun 2016 14:22:27 +0200 Subject: [PATCH] We are using QT 5.5, because we had troubles with the current QT 5.6 brew --- .travis.yml | 10 ++++------ build-systems/travis/create-dmg.sh | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19080d5..8e37700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,12 +33,10 @@ install: ; else brew update > /dev/null - && brew install qt5 - && cd `brew --prefix` - && echo "We are using QT 5.4.2, because we had troubles with the current QT 5.6 brew. The deployed frameworks were loading libraries from /usr/local/Cellar/qt5 instead of the app bundle." - && git checkout 00e46351980ad915424aad9316abffc19936809c Library/Formula/qt5.rb - && cd - - && chmod -R 755 /usr/local/opt/qt5/* + && brew tap homebrew/versions + && echo "We are using QT 5.5, because we had troubles with the current QT 5.6 brew. The deployed frameworks were loading libraries from /usr/local/Cellar/qt5 instead of the app bundle." + && brew install qt55 + && chmod -R 755 /usr/local/opt/qt55/* ; fi diff --git a/build-systems/travis/create-dmg.sh b/build-systems/travis/create-dmg.sh index 1f16440..eaae8e3 100755 --- a/build-systems/travis/create-dmg.sh +++ b/build-systems/travis/create-dmg.sh @@ -5,7 +5,7 @@ # #QTDIR="/Applications/Qt/5.5/clang_64" -QTDIR="/usr/local/opt/qt5" +QTDIR="/usr/local/opt/qt55" APP=LogAnalyzer # this directory name will also be shown in the title when the DMG is mounted TEMPDIR=$APP