From 221d0cb355f55d751b7aa7ef5f6fc2f229440e1f Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Mon, 16 Oct 2017 13:48:38 -0400
Subject: [PATCH] Switch Travis-CI to Qt5.8 (#3885)

---
 .travis/linux..before_install.sh | 1 +
 .travis/linux..install.sh        | 2 +-
 .travis/linux..script.sh         | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh
index f5e3b435c..fc43bafae 100644
--- a/.travis/linux..before_install.sh
+++ b/.travis/linux..before_install.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
 sudo add-apt-repository ppa:andrewrk/libgroove -y
 sudo sed -e "s/trusty/precise/" -i \
 	/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list
diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh
index f5988a83d..9c7d3c4b1 100644
--- a/.travis/linux..install.sh
+++ b/.travis/linux..install.sh
@@ -9,7 +9,7 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 PACKAGES="$PACKAGES libjack0"
 
 if [ $QT5 ]; then
-	PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
+	PACKAGES="$PACKAGES qt58base qt58translations qt58tools"
 else
 	PACKAGES="$PACKAGES libqt4-dev"
 fi
diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh
index 895f5875a..8fdf66027 100644
--- a/.travis/linux..script.sh
+++ b/.travis/linux..script.sh
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
+if [ $QT5 ]; then
+	unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
+	source /opt/qt58/bin/qt58-env.sh
+fi
 
 cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..