diff --git a/.travis.yml b/.travis.yml index 78b8408a9..7d021684d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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; diff --git a/common.pri b/common.pri index bf4b152ab..a8d87933e 100644 --- a/common.pri +++ b/common.pri @@ -29,28 +29,32 @@ 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, 11) {# Qt 5.12 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 + 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, 10) {# Qt 5.11 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 + equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) {# Qt 5.12 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 } 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 } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 8) {# Qt 5.9 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 + equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 9) {# Qt 5.10 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 8) {# Qt 5.9 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 7) {# Qt 5.8 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {# Qt 5.4 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 + equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } 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 + } } } }