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
38b95d22
Commit
38b95d22
authored
Jan 04, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch OSX to Qt 5.9.3
parent
a34b406b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
3 deletions
+34
-3
.travis.yml
.travis.yml
+3
-3
MakeQtTravisTarball.sh
deploy/MakeQtTravisTarball.sh
+31
-0
No files found.
.travis.yml
View file @
38b95d22
...
...
@@ -115,8 +115,8 @@ install:
# osx dependencies: qt, gstreamer, gstreamer-devel
-
if [ "${SPEC}" = "macx-clang" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.
1-mac-clang
-min.tar.bz2 &&
tar jxf Qt5.9.
1-mac-clang
-min.tar.bz2 -C /tmp
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
;
fi
...
...
@@ -135,7 +135,7 @@ install:
-
if [ "${SPEC}" = "macx-clang" ]; then
wget --quiet 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.9-
mac-clang/5.9.1
/clang_64 &&
export QT_DIR=Qt5.9-
clang_64/5.9.3
/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
0 → 100755
View file @
38b95d22
#!/bin/bash -x
if
[[
$#
-eq
0
]]
;
then
echo
'MakeQtTravisTarball.sh QtDirectory QtFullVersion QtBaseVersion BuildType'
exit
1
fi
QT_DIRECTORY
=
$1
if
[
!
-d
${
QT_DIRECTORY
}
]
;
then
echo
'Specify directory for Qt Directory.'
exit
1
fi
QT_FULL_VERSION
=
$2
if
[
!
-d
${
QT_DIRECTORY
}
/
${
QT_FULL_VERSION
}
]
;
then
echo
'Qt version directory not found'
exit
1
fi
QT_BASE_VERSION
=
$3
QT_BUILD_TYPE
=
$4
if
[
!
-d
${
QT_DIRECTORY
}
/
${
QT_FULL_VERSION
}
/
${
QT_BUILD_TYPE
}
]
;
then
echo
'Qt build type directory not found'
exit
1
fi
mkdir
-p
Qt
${
QT_BASE_VERSION
}
-
${
QT_BUILD_TYPE
}
/
${
QT_FULL_VERSION
}
/
${
QT_BUILD_TYPE
}
cp
-r
${
QT_DIRECTORY
}
/
${
QT_FULL_VERSION
}
/
${
QT_BUILD_TYPE
}
Qt
${
QT_BASE_VERSION
}
-
${
QT_BUILD_TYPE
}
/
${
QT_FULL_VERSION
}
rm
-rf
Qt
${
QT_BASE_VERSION
}
-
${
QT_BUILD_TYPE
}
/
${
QT_FULL_VERSION
}
/
${
QT_BUILD_TYPE
}
/doc
tar
-jcvf
Qt
${
QT_FULL_VERSION
}
-
${
QT_BUILD_TYPE
}
-min
.tar.bz2 Qt
${
QT_BASE_VERSION
}
-
${
QT_BUILD_TYPE
}
/
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