Unverified Commit 4d57dbcc authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6527 from DonLakeFlyer/OSXQt5.11.0

Switch OSX build to Qt 5.11.0
parents 8cfaaec0 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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment