-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
3 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,7 +64,7 @@ matrix: | |
| - os: osx | ||
| compiler: clang | ||
| env: | ||
| - QT_BASE=59 | ||
| - QT_BASE=510 | ||
|
|
||
| before_install: | ||
| - if [[ "$QT_BASE" = "51" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo add-apt-repository ppa:beineri/opt-qt511-trusty -y; fi | ||
|
|
@@ -76,6 +76,7 @@ before_install: | |
| - if [[ "$QT_BASE" = "57" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y; fi | ||
| - if [[ "$QT_BASE" = "58" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y; fi | ||
| - if [[ "$QT_BASE" = "59" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y; fi | ||
| - if [[ "$QT_BASE" = "510" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo add-apt-repository ppa:beineri/opt-qt510-trusty -y; fi | ||
| - if [ "$TRAVIS_OS_NAME" = "linux" ]; then | ||
| sudo apt-get update -qq; | ||
| else | ||
|
|
@@ -98,7 +99,7 @@ install: | |
| - if [[ "$QT_BASE" = "59" && "$TRAVIS_OS_NAME" = "linux" ]]; then sudo apt-get install -qq qt59base; source /opt/qt59/bin/qt59-env.sh; fi | ||
| - if [[ "$QT_BASE" = "55" && "$TRAVIS_OS_NAME" = "osx" ]]; then brew install [email protected]; brew link --force [email protected]; fi | ||
| - if [[ "$QT_BASE" = "57" && "$TRAVIS_OS_NAME" = "osx" ]]; then brew install [email protected]; brew link --force [email protected]; fi | ||
| - if [[ "$QT_BASE" = "59" && "$TRAVIS_OS_NAME" = "osx" ]]; then brew install qt; brew link --force qt; fi | ||
| - if [[ "$QT_BASE" = "510" && "$TRAVIS_OS_NAME" = "osx" ]]; then brew install qt; brew link --force qt; fi | ||
|
|
||
|
|
||
| script: | ||
|
|
||