From d2904b567b0aabda2076e9a7834e9549cc7adf44 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 2 Mar 2017 19:04:59 +0200 Subject: [PATCH] Since Qt 5.8 minimal supported OSX version is 10.9. --HG-- branch : develop --- src/app/tape/tape.pro | 14 +++++++++----- src/app/valentina/valentina.pro | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a33906354..c66bed84b 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -202,13 +202,17 @@ unix{ # Check which minimal OSX version supports current Qt version # See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) { - 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) { - 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 + } } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 0dc74aaf5..f2f41abec 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -205,13 +205,17 @@ unix{ # Check which minimal OSX version supports current Qt version # See page https://doc.qt.io/qt-5/supported-platforms-and-configurations.html - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) { - 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) { - 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 + } } }