From c6e38932dc38f36443a1e3434d9a77d984ca3c3b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 22 May 2018 19:22:11 +0300 Subject: [PATCH] Update minimal requirements for Qt on Mac OS X. --HG-- branch : develop --- common.pri | 30 ++++++++++++++++++++++++++++++ src/app/tape/tape.pro | 16 +--------------- src/app/valentina/valentina.pro | 16 +--------------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/common.pri b/common.pri index f14d6c048..486fe155f 100644 --- a/common.pri +++ b/common.pri @@ -25,6 +25,36 @@ win32{ VCOPY = $$QMAKE_COPY /D } +macx{ + # 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, 10) {# Qt 5.11 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 + } else { + 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, 8) {# Qt 5.9 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 + } else { + 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, 6) {# Qt 5.7 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + } else { + 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 + } + } + } + } + } + } +} + # See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403) # Copy of answer: # We occasionally had customers getting very similar warning messages but the software was also crashing. diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index b895b7edd..a4769bdd1 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -216,21 +216,7 @@ unix{ # Some macx stuff QMAKE_MAC_SDK = macosx - # 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, 7) {# Qt 5.8 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 - } else { - 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 - } - } - } + # QMAKE_MACOSX_DEPLOYMENT_TARGET defined in common.pri CONFIG(release, debug|release){ QMAKE_RPATHDIR += @executable_path/../Frameworks diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index d2247b3f6..8da7a5629 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -202,21 +202,7 @@ unix{ # Some macx stuff QMAKE_MAC_SDK = macosx - # 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, 7) {# Qt 5.8 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - } else { - equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {# Qt 5.7 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 - } else { - 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 - } - } - } + # QMAKE_MACOSX_DEPLOYMENT_TARGET defined in common.pri CONFIG(release, debug|release){ QMAKE_RPATHDIR += @executable_path/../Frameworks