diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-09 16:44:13 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-10 08:47:11 +0000 |
| commit | 233c438a2d9e273703104a5319a9f83db73a0f57 (patch) | |
| tree | b893111e60f12e48c2bd729cf0fdd47e08c8d19a /src/plugins/qbsprojectmanager/qbsproject.cpp | |
| parent | 8652188ac9beb65ac78999c679d945a698a70c85 (diff) | |
| download | qt-creator-233c438a2d9e273703104a5319a9f83db73a0f57.tar.gz | |
QbsProjectManager: Consider cpp.platformDefines for the code model
Fixes: QTCREATORBUG-19537
Change-Id: Ia51441491913da0f7b31c2ff02e2552ff58147f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsproject.cpp')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index f0de5fe952..08e65445cb 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -888,7 +888,9 @@ static RawProjectParts generateProjectParts( rpp.setFlagsForC({cToolChain.get(), cFlags}); rpp.setFlagsForCxx({cxxToolChain.get(), cxxFlags}); - rpp.setMacros(transform<QVector>(arrayToStringList(props.value("cpp.defines")), + const QStringList defines = arrayToStringList(props.value("cpp.defines")) + + arrayToStringList(props.value("cpp.platformDefines")); + rpp.setMacros(transform<QVector>(defines, [](const QString &s) { return Macro::fromKeyValue(s); })); ProjectExplorer::HeaderPaths grpHeaderPaths; |