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

QbsProjectManager: Consider cpp.distributionIncludePaths

Browse Source 
... and pass them to the code model.

Fixes: QTCREATORBUG-24162
Change-Id: I4f33bba659fca957c56f2fcb4b8adce28533074b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
This commit is contained in:
Christian Kandeler
2020-06-23 13:03:40 +02:00
parent db2f2f92b6
commit 7fad01eb02
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,7 +902,8 @@ static RawProjectParts generateProjectParts(
list.removeDuplicates(); list.removeDuplicates();
for (const QString &p : qAsConst(list)) for (const QString &p : qAsConst(list))
grpHeaderPaths += {FilePath::fromUserInput(p).toString(), HeaderPathType::User}; grpHeaderPaths += {FilePath::fromUserInput(p).toString(), HeaderPathType::User};
list = arrayToStringList(props.value("cpp.systemIncludePaths")); list = arrayToStringList(props.value("cpp.distributionIncludePaths"))
+ arrayToStringList(props.value("cpp.systemIncludePaths"));
list.removeDuplicates(); list.removeDuplicates();
for (const QString &p : qAsConst(list)) for (const QString &p : qAsConst(list))
grpHeaderPaths += {FilePath::fromUserInput(p).toString(), HeaderPathType::System}; grpHeaderPaths += {FilePath::fromUserInput(p).toString(), HeaderPathType::System};

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

@@ -381,6 +381,7 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
"cpp.cxxLanguageVersion", "cpp.cxxLanguageVersion",
"cpp.cxxStandardLibrary", "cpp.cxxStandardLibrary",
"cpp.defines", "cpp.defines",
"cpp.distributionIncludePaths",
"cpp.driverFlags", "cpp.driverFlags",
"cpp.enableExceptions", "cpp.enableExceptions",
"cpp.enableRtti", "cpp.enableRtti",