From da1bca07a182195fdcb4fbb83abe05e9f63b33f4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 May 2019 08:43:50 +0200 Subject: [PATCH] QbsProjectManager: Consider cpp.minimum*Version properties ... when setting up the code model for Darwin targets. Fixes: QTCREATORBUG-22355 Change-Id: I5cade8d3139dc3602298e9d4d056c9745b208489 Reviewed-by: Ivan Komissarov Reviewed-by: Nikolai Kosjar --- src/plugins/qbsprojectmanager/qbsproject.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 521b210852f..94bcb5a988c 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -864,6 +864,16 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags, cFlags << "-std=c99"; else if (!cLanguageVersion.isEmpty()) cFlags << ("-std=" + cLanguageVersion.first()); + + if (targetOS.contains("darwin")) { + const auto darwinVersion = getCppProp("minimumDarwinVersion").toString(); + if (!darwinVersion.isEmpty()) { + const auto darwinVersionFlag = getCppProp("minimumDarwinVersionCompilerFlag") + .toString(); + if (!darwinVersionFlag.isEmpty()) + cxxFlags << (darwinVersionFlag + '=' + darwinVersion); + } + } } else if (toolchain.contains("msvc")) { if (enableExceptions.toBool()) { const QString exceptionModel = getCppProp("exceptionHandlingModel").toString();