diff --git a/.travis.yml b/.travis.yml index 337591273..a95308416 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ matrix: include: - env: TARGET_OS=win32 - env: TARGET_OS=win64 + - env: QT5=True - os: osx before_install: - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh index 233bd784f..90da27640 100644 --- a/.travis/linux..before_install.sh +++ b/.travis/linux..before_install.sh @@ -1,2 +1,6 @@ sudo add-apt-repository ppa:kalakris/cmake -y; +if [ $QT5 ] + then + sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y +fi sudo apt-get update -qq diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh index 49a6ea466..8bbaf24ad 100644 --- a/.travis/linux..install.sh +++ b/.travis/linux..install.sh @@ -1,4 +1,13 @@ -sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev \ - libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev \ - libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib \ - libfltk1.3-dev libgig-dev +PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev + libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev + libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev + libgig-dev" + +if [ $QT5 ] +then + PACKAGES="$PACKAGES qtbase5-dev" +else + PACKAGES="$PACKAGES libqt4-dev" +fi + +sudo apt-get install -y $PACKAGES diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh index c9de77d36..3403b74f2 100644 --- a/.travis/linux..script.sh +++ b/.travis/linux..script.sh @@ -1 +1 @@ -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON .. +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON -DWANT_QT5=$QT5 ..