Bump requirements for Mac OS X since Qt 5.14.
--HG-- branch : develop
This commit is contained in:
parent
843ff594e3
commit
caf5fda8da
|
@ -19,7 +19,7 @@ jobs:
|
|||
env:
|
||||
- DEPLOY=true
|
||||
- LEGACY=false
|
||||
osx_image: xcode10
|
||||
osx_image: xcode11
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env:
|
||||
|
@ -63,7 +63,6 @@ before_install:
|
|||
brew update > /dev/null;
|
||||
if [[ "$LEGACY" = false ]]; then
|
||||
brew install qt5;
|
||||
brew upgrade qt5;
|
||||
else
|
||||
unset SSL_CERT_FILE;
|
||||
brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/20544ac8e68ef3523f92e15f432bbaf9a6aa2c22/qt5.rb;
|
||||
|
|
|
@ -29,6 +29,9 @@ macx{
|
|||
# Check which minimal OSX version supports current Qt version
|
||||
# See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html
|
||||
# For older versions https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html
|
||||
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 13) {# Qt 5.14
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
|
||||
} else {
|
||||
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {# Qt 5.12
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
|
||||
} else {
|
||||
|
@ -59,6 +62,7 @@ macx{
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403)
|
||||
# Copy of answer:
|
||||
|
|
Loading…
Reference in New Issue
Block a user