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

CppTools: Guard against doubled header paths

Browse Source 
Change-Id: If183b6d2210028f74dae839db782114ce79911c4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-11-17 16:21:13 +01:00
parent c88d18c310
commit 6deaf6b23d
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cpptools/cppprojects.cpp
View File

@@ -59,6 +59,16 @@ ProjectPart::ProjectPart()
{ {
} }
static ProjectPart::HeaderPath toProjectPartHeaderPath(const ProjectExplorer::HeaderPath &headerPath)
{
const ProjectPart::HeaderPath::Type headerPathType =
headerPath.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath
? ProjectPart::HeaderPath::FrameworkPath
: ProjectPart::HeaderPath::IncludePath;
return ProjectPart::HeaderPath(headerPath.path(), headerPathType);
}
/*! /*!
\brief Retrieves info from concrete compiler using it's flags. \brief Retrieves info from concrete compiler using it's flags.
@@ -106,10 +116,9 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc,
const QList<ProjectExplorer::HeaderPath> headers = tc->systemHeaderPaths(commandLineFlags, sysRoot); const QList<ProjectExplorer::HeaderPath> headers = tc->systemHeaderPaths(commandLineFlags, sysRoot);
foreach (const ProjectExplorer::HeaderPath &header, headers) { foreach (const ProjectExplorer::HeaderPath &header, headers) {
headerPaths << ProjectPart::HeaderPath(header.path(), const HeaderPath headerPath = toProjectPartHeaderPath(header);
header.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath if (!headerPaths.contains(headerPath))
? ProjectPart::HeaderPath::FrameworkPath headerPaths << headerPath;
: ProjectPart::HeaderPath::IncludePath);
} }
toolchainDefines = tc->predefinedMacros(commandLineFlags); toolchainDefines = tc->predefinedMacros(commandLineFlags);