diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-29 12:42:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-29 12:02:22 +0000 |
| commit | 57fbf9bef945711142acbc6d47a9b7fd9f2b0a3f (patch) | |
| tree | bb6e0017855c83a20add3a7d126cf0e8173b11f6 | |
| parent | 61008bcd478f332a6472eb9919f056fca53e9eb9 (diff) | |
CppEditor: Consider -include flags from the project again
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>
| -rw-r--r-- | src/plugins/cppeditor/projectpart.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp index 1d827648fc..b51c28d64c 100644 --- a/src/plugins/cppeditor/projectpart.cpp +++ b/src/plugins/cppeditor/projectpart.cpp @@ -129,6 +129,11 @@ static ToolChain::MacroInspectionReport getToolchainMacros( 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, const RawProjectPart &rpp, const QString &displayName, @@ -148,7 +153,7 @@ ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject, languageExtensions(languageExtensions | flags.languageExtensions), qtVersion(rpp.qtVersion), files(files), - includedFiles(rpp.includedFiles), + includedFiles(getIncludedFiles(rpp, flags)), precompiledHeaders(rpp.precompiledHeaders), headerPaths(getHeaderPaths(rpp, flags, tcInfo)), projectMacros(getProjectMacros(rpp)), |