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

QbsProjectManager: Consider cpp.platformDefines for the code model

Browse Source 
Fixes: QTCREATORBUG-19537
Change-Id: Ia51441491913da0f7b31c2ff02e2552ff58147f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-09 16:44:13 +01:00
parent 8652188ac9
commit 233c438a2d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,7 +888,9 @@ static RawProjectParts generateProjectParts(
rpp.setFlagsForC({cToolChain.get(), cFlags}); rpp.setFlagsForC({cToolChain.get(), cFlags});
rpp.setFlagsForCxx({cxxToolChain.get(), cxxFlags}); 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); })); [](const QString &s) { return Macro::fromKeyValue(s); }));
ProjectExplorer::HeaderPaths grpHeaderPaths; ProjectExplorer::HeaderPaths grpHeaderPaths;

1
src/plugins/qbsprojectmanager/qbssession.cpp
View File

@@ -392,6 +392,7 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
"cpp.minimumDarwinVersionCompilerFlag", "cpp.minimumDarwinVersionCompilerFlag",
"cpp.platformCommonCompilerFlags", "cpp.platformCommonCompilerFlags",
"cpp.platformDriverFlags", "cpp.platformDriverFlags",
"cpp.platformDefines",
"cpp.positionIndependentCode", "cpp.positionIndependentCode",
"cpp.systemFrameworkPaths", "cpp.systemFrameworkPaths",
"cpp.systemIncludePaths", "cpp.systemIncludePaths",