Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a3129aa1
Commit
a3129aa1
authored
Mar 28, 2017
by
Don Gagne
Committed by
GitHub
Mar 28, 2017
Browse files
Merge pull request #4878 from DonLakeFlyer/OSXTravis5.7
Switch OS X to 5.7
parents
e39f6f28
c7511df2
Changes
1
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
a3129aa1
...
...
@@ -115,15 +115,15 @@ install:
# osx dependencies: qt, gstreamer, gstreamer-devel
-
if [ "${SPEC}" = "macx-clang" ]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
8.0
-mac-clang-min.tar.bz2 &&
tar jxf Qt5.
8.0
-mac-clang-min.tar.bz2 -C /tmp &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
7.1
-mac-clang-min.tar.bz2 &&
tar jxf Qt5.
7.1
-mac-clang-min.tar.bz2 -C /tmp &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg &&
sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 &&
sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks &&
export QT_DIR=Qt5.
8
-mac-clang/5.
8
/clang_64 &&
export QT_DIR=Qt5.
7
-mac-clang/5.
7
/clang_64 &&
export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins &&
export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml &&
export PATH=/tmp/$QT_DIR/bin:$PATH
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment