feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Consider cpp.minimum*Version properties

Browse Source 
... 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>
This commit is contained in:
Christian Kandeler
2019-05-08 08:43:50 +02:00
parent d0a51796a6
commit da1bca07a1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -864,6 +864,16 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags,
cFlags << "-std=c99"; cFlags << "-std=c99";
else if (!cLanguageVersion.isEmpty()) else if (!cLanguageVersion.isEmpty())
cFlags << ("-std=" + cLanguageVersion.first()); 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")) { } else if (toolchain.contains("msvc")) {
if (enableExceptions.toBool()) { if (enableExceptions.toBool()) {
const QString exceptionModel = getCppProp("exceptionHandlingModel").toString(); const QString exceptionModel = getCppProp("exceptionHandlingModel").toString();