diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-08 08:43:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-09 11:57:51 +0000 |
| commit | da1bca07a182195fdcb4fbb83abe05e9f63b33f4 (patch) | |
| tree | 128402867d132c9bd8939d5dd748cce38acf3802 | |
| parent | d0a51796a6ae74496612366a07b0eb3299977284 (diff) | |
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 <ABBAPOH@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 521b210852..94bcb5a988 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(); |