Skip to content

Commit

Permalink
Update url of prebuilt Qt for OSX
Browse files Browse the repository at this point in the history
Using the prebuilt Qt version provided by Subsurface
https://github.com/Subsurface-divelog/subsurface
  • Loading branch information
mortbopet committed Jan 2, 2020
1 parent d3ac2c2 commit 4d89092
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions scripts/mac/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ git describe

pushd ${TRAVIS_BUILD_DIR}

mkdir -p Qt/5.11.1

echo "Get custom Qt build and unpack it"
curl --output Qt-5.11.1-mac.tar.xz \
https://storage.googleapis.com/travis-cache/Qt-5.11.1-mac.tar.xz
md5 Qt-5.11.1-mac.tar.xz

tar -xJ -C Qt/5.11.1 -f Qt-5.11.1-mac.tar.xz
mkdir -p Qt/5.13.0
curl --output Qt-5.13.0-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.13.0-mac.tar.xz
tar -xJ -C Qt/5.13.0 -f Qt-5.13.0-mac.tar.xz
2 changes: 1 addition & 1 deletion scripts/mac/travisbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
# this gets executed by Travis when building an App for Mac
# it gets started from inside the subsurface directory

export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.11.1/clang_64
export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.13.0/clang_64
export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

Expand Down

0 comments on commit 4d89092

Please sign in to comment.