Travis: switch to Qt 5.9.1

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-29 07:26:48 -07:00
parent 3cd584e137
commit a156e56266

View file

@ -29,11 +29,11 @@ addons:
- mesa-common-dev
before_install:
- if [ ! -e Qt/5.9 ] ; then
- if [ ! -e Qt/5.9.1 ] ; then
rm -rf Qt ;
wget http://download.qt.io/official_releases/qt/5.9/5.9.0/qt-opensource-linux-x64-5.9.0.run ;
chmod +x ./qt-opensource-linux-x64-5.9.0.run ;
./qt-opensource-linux-x64-5.9.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
wget http://download.qt.io/official_releases/qt/5.9/5.9.1/qt-opensource-linux-x64-5.9.1.run ;
chmod +x ./qt-opensource-linux-x64-5.9.1.run ;
./qt-opensource-linux-x64-5.9.1.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
fi
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to
- "export DISPLAY=:99.0"
@ -41,7 +41,7 @@ before_install:
script:
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.9/gcc_64/lib/cmake ;
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.9.1/gcc_64/lib/cmake ;
cd .. ;
bash -e ./subsurface/scripts/build.sh -both
- env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check