Skip to content

Commit

Permalink
Bump Qt to 5.9.2
Browse files Browse the repository at this point in the history
Closes #3925
  • Loading branch information
tresf committed Nov 27, 2017
1 parent 46ef3c6 commit d0194e6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis/linux..before_install.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis/linux..install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis/linux..script.sh
Original file line number Diff line number Diff line change
@@ -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 ..

0 comments on commit d0194e6

Please sign in to comment.