From b5df0fa270342ac5b5bbfaebf98df995e8a73fdd Mon Sep 17 00:00:00 2001 From: Matthew Horan Date: Sun, 25 Jan 2015 21:32:24 -0500 Subject: [PATCH] Clean up Travis before install script Only install Qt 5 when building against Qt 5. Remove unnecessary explicit dependencies. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fbc73f..7253299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 1.9.3 - - 2.1.2 + - 2.1 - jruby-19mode notifications: email: false @@ -22,7 +22,5 @@ gemfile: - gemfiles/2.3.gemfile - gemfiles/2.4.gemfile before_install: - - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa - - sudo apt-get update - - sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev qtlocation5-dev qtsensors5-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev qt4-default + - sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi' install: bundle