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
cf510700
Commit
cf510700
authored
Apr 06, 2016
by
Don Gagne
Browse files
Merge pull request #3158 from DonLakeFlyer/GStreamerOff
Turn off streamer for OSX
parents
add30359
d97fddaa
Changes
1
Show whitespace changes
Inline
Side-by-side
.travis.yml
View file @
cf510700
...
...
@@ -105,13 +105,14 @@ install:
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2 &&
tar jxf Qt5.5.1-mac-clang.tar.bz2 -C /tmp &&
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.5-mac-clang/5.5/clang_64 &&
export PATH=/tmp/$QT_DIR/bin:$PATH &&
export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins &&
export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml
;
fi
# This belonds in the osx build once I figure out how to add it to the installer
# sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks &&
-
if [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" = "ios" ]]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-ios.tar.bz2 &&
tar jxf Qt5.5.1-ios.tar.bz2 -C /tmp &&
...
...
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