palo
/
valentina
mirror of https://gitlab.com/smart-pattern/valentina.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump requirements for Mac OS X since Qt 5.14. 

--HG--
branch : develop
merge-requests/1/merge
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;

32
common.pri
View File

@ -29,28 +29,32 @@ 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, 11) {# Qt 5.12 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 13) {# Qt 5.14
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 10) {# Qt 5.11 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {# Qt 5.12
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 9) {# Qt 5.10 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 10) {# Qt 5.11
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 8) {# Qt 5.9 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 9) {# Qt 5.10
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 8) {# Qt 5.9
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
} else { } else {
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} else { } else {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
} else {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
}
} }
} }
} }