Merge branch 'travis'

This commit is contained in:
Unknown W. Brackets committed 2015-06-13 16:29:34 -07:00
commit edb55f5bea
1 file changed
+2 -2
+2 -2
View File
@@ -26,7 +26,7 @@ travis_before_install() {
if [ ! "$TRAVIS_OS_NAME" = "osx" ]; then
sudo apt-get update -qq
sudo apt-get install aria2 pv -qq
sudo apt-get install software-properties-common aria2 pv build-essential libgl1-mesa-dev libglu1-mesa-dev -qq
if [ "$CMAKE" = "TRUE" ]; then
sudo apt-get install lib32stdc++6 lib32z1 lib32z1-dev cmake -qq
@@ -53,7 +53,7 @@ travis_install() {
fi
if [ "$QT" = "TRUE" ]; then
sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev
sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev qt5-default
fi
fi