From 4b478efa61251d350ded6458d4eb5f0fbedd19b9 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Mon, 10 Nov 2014 15:12:45 -0500 Subject: [PATCH] Build both Qt4 and Qt5 --- .travis.yml | 5 ++++- travis-dependencies.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74f6feff..7e2bd5fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: cpp +env: + - QT="-DWITH_QT4=0" + - QT="-DWITH_QT4=1" os: - linux - osx compiler: - gcc - clang -script: mkdir build && cd build && cmake .. -DWITH_SERVER=1 && make +script: mkdir build && cd build && cmake .. $QT -DWITH_SERVER=1 && make install: ./travis-dependencies.sh cache: apt diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 10af11cd..2bfabf6b 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -2,8 +2,8 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update - brew install qt protobuf libgcrypt + brew install qt qt5 protobuf libgcrypt else sudo apt-get update -qq - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev + sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev qt5-default qttools5-dev-tools fi