Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4358acdc
Commit
4358acdc
authored
May 29, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch OSX build to Qt 5.11.0
parent
8cfaaec0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
.travis.yml
.travis.yml
+3
-3
MakeQtTravisTarball.sh
deploy/MakeQtTravisTarball.sh
+3
-3
No files found.
.travis.yml
View file @
4358acdc
...
...
@@ -99,8 +99,8 @@ install:
# osx dependencies: qt (master builds only: gstreamer, gstreamer-devel)
-
if [ "${SPEC}" = "macx-clang" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
9.3
-clang_64-min.tar.bz2 &&
tar jxf Qt5.
9.3
-clang_64-min.tar.bz2 -C /tmp
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
11.0
-clang_64-min.tar.bz2 &&
tar jxf Qt5.
11.0
-clang_64-min.tar.bz2 -C /tmp
;
fi
...
...
@@ -123,7 +123,7 @@ install:
fi
-
if [ "${SPEC}" = "macx-clang" ]; then
export QT_DIR=Qt5.
9-clang_64/5.9.3
/clang_64 &&
export QT_DIR=Qt5.
11-clang_64/5.11.0
/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
...
...
deploy/MakeQtTravisTarball.sh
View file @
4358acdc
...
...
@@ -11,12 +11,12 @@ if [ ! -d ${QT_DIRECTORY} ]; then
exit
1
fi
QT_FULL_VERSION
=
5.
9.3
QT_BASE_VERSION
=
5.
9
QT_FULL_VERSION
=
5.
11.0
QT_BASE_VERSION
=
5.
11
QT_BUILD_TYPE
=
$2
if
[
!
-d
${
QT_DIRECTORY
}
/
${
QT_FULL_VERSION
}
/
${
QT_BUILD_TYPE
}
]
;
then
echo
'Qt build type directory not found. Specify example: clang_62
'
echo
'Qt build type directory not found. Specify example: clang_64
'
exit
1
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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