From bbb46a885d3666d6f49b3911efd63aa44ae980e1 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 20 Mar 2016 20:44:13 +0100 Subject: Improve handling of Qt5 subversions on OS X. Qt 5.6 on OS X requires targeting at least OS X 10.7, while for earlier versions we can still target 10.6. Handle this case and inform the user about the used target version. Change-Id: I78e426037e2966241ab9a63105e04e7366b469ed --- rbutil/rbutilqt/rbutilqt.pro | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 243e592255..0b1f5fde54 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -218,14 +218,22 @@ macx:!intel { QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk } macx:intel { - QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 contains(QT_MAJOR_VERSION, 5) { QMAKE_MAC_SDK=macosx + greaterThan(QT_MINOR_VERSION, 5) { + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 + message("Qt 5.6+ detected: setting deploy target to 10.7") + } + !greaterThan(QT_MINOR_VERSION, 5) { + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + message("Qt up to 5.5 detected: setting deploy target to 10.6") + } } !contains(QT_MAJOR_VERSION, 5) { QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 + QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 } - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 } macx { CONFIG += x86 -- cgit v1.2.3