From 7fad01eb026d92007fc8a813601625a465c1db6a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 23 Jun 2020 13:03:40 +0200 Subject: [PATCH] QbsProjectManager: Consider cpp.distributionIncludePaths ... and pass them to the code model. Fixes: QTCREATORBUG-24162 Change-Id: I4f33bba659fca957c56f2fcb4b8adce28533074b Reviewed-by: Ivan Komissarov --- src/plugins/qbsprojectmanager/qbsproject.cpp | 3 ++- src/plugins/qbsprojectmanager/qbssession.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 51a16e0f6f6..f45083fe8a7 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -902,7 +902,8 @@ static RawProjectParts generateProjectParts( list.removeDuplicates(); for (const QString &p : qAsConst(list)) 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(); for (const QString &p : qAsConst(list)) grpHeaderPaths += {FilePath::fromUserInput(p).toString(), HeaderPathType::System}; diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index af2dd633642..f03b4176efb 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -381,6 +381,7 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request) "cpp.cxxLanguageVersion", "cpp.cxxStandardLibrary", "cpp.defines", + "cpp.distributionIncludePaths", "cpp.driverFlags", "cpp.enableExceptions", "cpp.enableRtti",