Skip to content

Commit 85c9f81

Browse files
Update Qt installation to 5.6.3 for Travis
Signed-off-by: Thiago Macieira <[email protected]>
1 parent 45ab2d0 commit 85c9f81

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ os:
44
- osx
55
env:
66
- CFLAGS="-O0 -g" QMAKEFLAGS="-config debug" PATH=/opt/qt56/bin:/usr/local/opt/qt5/bin:$PATH
7+
addons:
8+
apt:
9+
sources:
10+
- sourceline: 'ppa:beineri/opt-qt563-trusty'
11+
packages:
12+
- qt56base valgrind
713
install:
8-
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
9-
sudo apt-add-repository -y ppa:beineri/opt-qt562;
10-
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test;
11-
sudo apt-get update -qq;
12-
sudo apt-get install -y qt56base valgrind g++-5;
13-
else
14+
- if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
1415
brew install qt5;
1516
fi
1617
script:
17-
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
18-
sudo ln -sf g++-5 /usr/bin/g++;
19-
fi
2018
- make -s -f Makefile.configure configure | tee .config
2119
- make
2220
CFLAGS="$CFLAGS"

0 commit comments

Comments
 (0)