diff options
| author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-06-21 19:53:26 +0200 |
|---|---|---|
| committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-06-21 19:53:26 +0200 |
| commit | db6aadc1370950bf2d2f93b7068a044a4c6aef5a (patch) | |
| tree | 54f9bb8a559feb63fd76e70796a260b5ff573cff /.travis.yml | |
| parent | ab78036ad5364eb746f9a16eada978f4f40aa43a (diff) | |
| parent | a2d9300539a57d1f6c9679a2617aa9354fbf2c72 (diff) | |
Merge branch 'master' into migrate-to-QJSEngine
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0a0dce2ba7..1172955be0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ install: # Build flags common to OS X and Linux. # Parallel builds are important for avoiding OSX build timeouts. # We turn off verbose output to avoid going over the 4MB output limit. - - 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 verbose=0" + - 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 verbose=0" ##### # Ubuntu Trusty Build |