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

CppEditor: Consider -include flags from the project again

Browse Source 
The fallback for build systems without a dedicated property for this got
lost somehow in 9c3420120e.

Fixes: QTCREATORBUG-27450
Change-Id: I70768220523693b9423a8256cef3d79f4d9dfd58
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-04-29 12:42:06 +02:00
parent 61008bcd47
commit 57fbf9bef9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/projectpart.cpp
View File

@@ -129,6 +129,11 @@ static ToolChain::MacroInspectionReport getToolchainMacros(
return report; return report;
} }
static QStringList getIncludedFiles(const RawProjectPart &rpp, const RawProjectPartFlags &flags)
{
return !rpp.includedFiles.isEmpty() ? rpp.includedFiles : flags.includedFiles;
}
ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject, ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
const RawProjectPart &rpp, const RawProjectPart &rpp,
const QString &displayName, const QString &displayName,
@@ -148,7 +153,7 @@ ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
languageExtensions(languageExtensions | flags.languageExtensions), languageExtensions(languageExtensions | flags.languageExtensions),
qtVersion(rpp.qtVersion), qtVersion(rpp.qtVersion),
files(files), files(files),
includedFiles(rpp.includedFiles), includedFiles(getIncludedFiles(rpp, flags)),
precompiledHeaders(rpp.precompiledHeaders), precompiledHeaders(rpp.precompiledHeaders),
headerPaths(getHeaderPaths(rpp, flags, tcInfo)), headerPaths(getHeaderPaths(rpp, flags, tcInfo)),
projectMacros(getProjectMacros(rpp)), projectMacros(getProjectMacros(rpp)),