We are using QT 5.5, because we had troubles with the current QT 5.6 …

…brew
pbek · Jun 11, 2016 · 355dad9 · 355dad9
1 parent e26f7c7
commit 355dad9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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