summaryrefslogtreecommitdiffstatshomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2015-08-01 20:41:27 +0200
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2015-08-01 20:43:47 +0200
commit9485ca9d43dcab732325e4ba16194153ea293d4b (patch)
tree5fb55315d4a4f3c001ecbdcf3b877d20ad60f2a6 /.travis.yml
parentc9174e36897ccb723de18cb0361557629caba912 (diff)
Revert "debugqt: Port to Qt5 [O. Galibert]"
Experience shows it's too early for that. I'll keep that in a corner and we'll see again later.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 5594528efc0..80e3b739633 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,16 @@ env:
- SUBTARGET=arcade MAME=mamearcade64
- SUBTARGET=mess MAME=mess64
script:
- - source /opt/qt55/bin/qt55-env.sh
- if [ $CC == 'clang' ];
- then make -j2 linux_x64_clang OPT_FLAGS="-fPIC" && ./$MAME -validate;
- else make -j2 OPTIMIZE=0 OPT_FLAGS="-fPIC" && ./$MAME -validate;
+ then make -j2 linux_x64_clang && ./$MAME -validate;
+ else make -j2 OPTIMIZE=0 && ./$MAME -validate;
fi
sudo: required
before_install:
- sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y
- - sudo apt-add-repository ppa:beineri/opt-qt55 -y
+ - sudo add-apt-repository ppa:shahar-evron/qt-backports -y
- sudo apt-get update -qq
- - sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libasound2-dev qt55base qt55tools
+ - sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libasound2-dev libqt4-dev libqt4-dev-bin
notifications:
- email: false
+ email:
+ - secure: "sK8JJcn1A0yLnbDJ/7vmJgESuXmP6D4QlvQvsYLp1xAx5eTVSJ5Z+GSXLBJ9CnoeJ5AlPVPX4rXdRV93UyxYlTh1O97x8VZZQtYBNPRjk/VCflsOOg7C+jcJKX/knMu/QG2MVEDE5G2b8mHSAgWljG/7Z2N0rYZlWppwklYafOkyW4uE0E7PU5XpmKim4ra6Y1eDSbap+XJiDwgUm9moDZrgAv7eom9NIWGNMRIozSRyR2IkYimlWE92FOy5PzLJtFGK02iumbYN+39mTux59v/h/m6HD6cD7Wf10Lco9+Fnmi9Bs+VvIReJIP9pDABRvJ3MkUV4I9BjUT9xk48lzxqjGtdfUwOMDOTABd4Pb/5cmNtyNUQIosy5oiplR6USBnqD7/gmJw+mfn3A+jdQHGne+akypwzUjSM6XrezjTiZLlDDG+QpA0kwAnxSXw8H2SpVyynMSn4nu0iZmOiOZMtFY0jKlt/W7OFC5wTuJFrky+bBGlVIv3KGOTJNJNgasXV4u0NXOjHyeBFpFYCIf0FZLfYyf7ITu94JxUzXGcVi5D0lBwvKY9HfJ4yJxciyfH6V7yU1+o23E/Meqe/tjt6dTW8DM5xIokrnusfzE5b0zw5GFyg54nbpazXpcPnrMdxhp+t2C7xKrxcZXhBECRYegj+Z86D9BJP/yum1YrQ="