Switch Travis-CI to Qt5.8 (#3885)

This commit is contained in:
Tres Finocchiaro
2017-10-16 13:48:38 -04:00
committed by GitHub
parent eaa7b0dd7c
commit 221d0cb355
3 changed files with 6 additions and 1 deletions

View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash
sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
sudo add-apt-repository ppa:andrewrk/libgroove -y
sudo sed -e "s/trusty/precise/" -i \
/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list

View File

@@ -9,7 +9,7 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
PACKAGES="$PACKAGES libjack0"
if [ $QT5 ]; then
PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
PACKAGES="$PACKAGES qt58base qt58translations qt58tools"
else
PACKAGES="$PACKAGES libqt4-dev"
fi

View File

@@ -1,3 +1,7 @@
#!/usr/bin/env bash
if [ $QT5 ]; then
unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
source /opt/qt58/bin/qt58-env.sh
fi
cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..