From d0194e6c64eca89cfdd896e6573a78dd15af9c5e Mon Sep 17 00:00:00 2001 From: tresf Date: Mon, 27 Nov 2017 10:39:55 -0500 Subject: [PATCH] Bump Qt to 5.9.2 Closes #3925 --- .travis/linux..before_install.sh | 2 +- .travis/linux..install.sh | 2 +- .travis/linux..script.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh index fc43bafae..91f86eef2 100644 --- a/.travis/linux..before_install.sh +++ b/.travis/linux..before_install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y +sudo add-apt-repository ppa:beineri/opt-qt592-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 563e4e7c0..b7087ee51 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 qt58base qt58translations qt58tools" + PACKAGES="$PACKAGES qt59base qt59translations qt59tools" else PACKAGES="$PACKAGES libqt4-dev" fi diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh index 8fdf66027..d23c66ef9 100644 --- a/.travis/linux..script.sh +++ b/.travis/linux..script.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ $QT5 ]; then unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH - source /opt/qt58/bin/qt58-env.sh + source /opt/qt59/bin/qt59-env.sh fi cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..