M .travis-deps.sh → .travis-deps.sh

@@ -1,16 +1,17 @@
 #!/bin/sh
 if [ $TRAVIS_OS_NAME = "osx" ]; then
 	brew update
-	brew install qt5 ffmpeg imagemagick sdl2 libzip libpng
+	brew install qt5 ffmpeg imagemagick sdl2 libedit libelf libpng libzip
 else
 	sudo apt-get clean
+	sudo add-apt-repository -y ppa:beineri/opt-qt542-trusty
 	sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
 	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 	sudo apt-get update
-	sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \
-		libpng-dev libsdl2-dev libzip-dev qtbase5-dev \
-		libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \
-		libavutil-dev libavformat-dev libavresample-dev libswscale-dev
+	sudo apt-get install -y -q cmake libedit-dev libelf-dev libmagickwand-dev \
+		libpng-dev libsdl2-dev libzip-dev qt54base qt54multimedia \
+		libavcodec-dev libavutil-dev libavformat-dev libavresample-dev \
+		libswscale-dev
 	if [ "$CC" == "gcc" ]; then
 		sudo apt-get install -y -q gcc-5 g++-5
 		export CC=gcc-5

M .travis.yml → .travis.yml

@@ -11,4 +11,4 @@
 before_install:
   - source ./.travis-deps.sh
 
-script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 .. && make -j2
+script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH='/usr/local/opt/qt5;/opt/qt54' .. && make -j2