summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-07-10 01:13:08 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2015-07-10 01:13:08 +0200
commit7f5ce8dc17b1a5d5756978f92464269b95f028af (patch)
treead6d7b55cd3ce0fc75acf1de8bd3c269bf35debd
parent436d6dbcbda7540379c2fab1564e7c50598e014b (diff)
ok, like this?
-rw-r--r--.travis.yml18
1 files changed, 18 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 63811d47..9d248efc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,24 @@ before_install:
- QtMkspec=$CC
- $CC --version
+install
+ - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+ sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+ && sudo apt-add-repository -y ppa:beineri/opt-qt541
+ && sudo apt-get -qq update
+ && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54svg qt54webkit
+ && export CXX="g++-4.8"
+ && export CC="gcc-4.8"
+ ;
+ else
+ brew update
+ && brew unlink cmake
+ && brew install cmake
+ && brew install qt5
+ && chmod -R 755 /usr/local/opt/qt5/*
+ ;
+ fi
+
script:
- cd qtpass
- qmake -v