QbsProjectManager: Consider cpp.distributionIncludePaths

... and pass them to the code model.

Fixes: QTCREATORBUG-24162
Change-Id: I4f33bba659fca957c56f2fcb4b8adce28533074b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

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};

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",