From 3ead080484ae741d263595a0a98de61eb926f45e Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 13 Oct 2017 13:48:21 +0200 Subject: [PATCH] Travis build matrix. --- .travis.yml | 3 +++ resources/scripts/.travis-install-linux.sh | 2 +- resources/scripts/.travis-install-osx.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9bfe9c07..cf33040ab 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ dist: trusty os: - linux - osx +env: +- qmake_args='USE_WEBENGINE=false' +- qmake_args='USE_WEBENGINE=true' compiler: - gcc branches: diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh index 5fcbc5834..d47301ede 100755 --- a/resources/scripts/.travis-install-linux.sh +++ b/resources/scripts/.travis-install-linux.sh @@ -2,6 +2,6 @@ source /opt/qt59/bin/qt59-env.sh mkdir rssguard-build && cd rssguard-build -qmake .. +qmake .. "$qmake_args" make make install \ No newline at end of file diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index ffc2b38b9..eb2eff1d6 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -1,7 +1,7 @@ #!/bin/sh mkdir rssguard-build && cd rssguard-build -qmake .. +qmake .. "$qmake_args" make make install