diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-04-21 21:32:46 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-05-20 18:53:46 -0700 |
| commit | 99856d368d57024576a71cd37e54e2e5f9e86cc8 (patch) | |
| tree | e540999dfc6ba6ec6f922907fd4a9ee8f1529365 /.travis.yml | |
| parent | dadcc14b15b749cbe434c7388090c9637d1ea0e8 (diff) | |
Switch Ubuntu Travis build to qt5.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 0f4d12aaff..15420f6314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,9 @@ addons: - libopusfile-dev - libportmidi-dev - libprotobuf-dev - - libqt4-dev - - libqt4-opengl-dev - - libqt4-sql-sqlite + - libqt5opengl5-dev + - libqt5sql5-sqlite + - libqt5svg5-dev - librubberband-dev - libshout3-dev - libsndfile1-dev @@ -42,6 +42,8 @@ addons: - libwavpack-dev - portaudio19-dev - protobuf-compiler + - qt5-default + - qtscript5-dev - scons - vamp-plugin-sdk - qtkeychain-dev @@ -61,7 +63,7 @@ install: # Build flags common to OS X and Linux. # Parallel builds are important for avoiding OSX build timeouts. - - export COMMON="-j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" + - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" ##### # Ubuntu Trusty Build @@ -69,7 +71,7 @@ install: #### # OS X Build - # Define QTDIR. Homebrew does not support Qt4 anymore, so /usr/local/Cellar/qt stores Qt5 installs. + # Define QTDIR. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1) ; fi # Workaround for bug in libopus's opus.h including <opus_multistream.h> @@ -80,9 +82,8 @@ install: # NOTE(rryan): 2016-11-15 we are experiencing Travis timeouts for the OSX # build. Turning off optimizations to see if that speeds up compile times. We # also need to avoid going over 4MB of output so we turn off verbose mode. - # NOTE(rryan): 2016-12-31 Homebrew has dropped qt4 support. Build with qt5. # TODO(rryan): localecompare doesn't work on Travis with qt5 for some reason. - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 verbose=0 qt5=1 localecompare=0" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 verbose=0 localecompare=0" ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi #### |