aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump requirements for Mac OS X since Qt 5.14.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2020-01-07 16:19:30 +02:00
parent 843ff594e3
commit caf5fda8da
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -19,7 +19,7 @@ jobs:
env: env:
- DEPLOY=true - DEPLOY=true
- LEGACY=false - LEGACY=false
osx_image: xcode10 osx_image: xcode11
- os: osx - os: osx
compiler: clang compiler: clang
env: env:
@ -63,7 +63,6 @@ before_install:
brew update > /dev/null; brew update > /dev/null;
if [[ "$LEGACY" = false ]]; then if [[ "$LEGACY" = false ]]; then
brew install qt5; brew install qt5;
brew upgrade qt5;
else else
unset SSL_CERT_FILE; unset SSL_CERT_FILE;
brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/20544ac8e68ef3523f92e15f432bbaf9a6aa2c22/qt5.rb; brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/20544ac8e68ef3523f92e15f432bbaf9a6aa2c22/qt5.rb;

4
common.pri
View File

@ -29,6 +29,9 @@ macx{
# Check which minimal OSX version supports current Qt version # Check which minimal OSX version supports current Qt version
# See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html # 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 # 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 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {# Qt 5.12
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
} else { } else {
@ -58,6 +61,7 @@ macx{
} }
} }
} }
}
} }
# See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403) # See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403)