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

CppTools: De-duplicate list of include paths

Browse Source 
It makes more sense to handle this centrally than in all the build
system plugins.

Fixes: QTCREATORBUG-24515
Change-Id: I1c0f815d44135bcfb76ce51c67b6494a50e1de48
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2020-09-07 13:56:12 +02:00
parent acd33f747d
commit 58e633a8a4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cpptools/cppprojectinfogenerator.cpp
View File

@@ -35,6 +35,8 @@
#include <QTimer> #include <QTimer>
#include <set>
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace CppTools { namespace CppTools {
@@ -94,7 +96,15 @@ static ProjectPart::Ptr projectPartFromRawProjectPart(
part->projectMacros = rawProjectPart.projectMacros; part->projectMacros = rawProjectPart.projectMacros;
if (!part->projectConfigFile.isEmpty()) if (!part->projectConfigFile.isEmpty())
part->projectMacros += Macro::toMacros(ProjectPart::readProjectConfigFile(part)); part->projectMacros += Macro::toMacros(ProjectPart::readProjectConfigFile(part));
part->headerPaths = rawProjectPart.headerPaths;
// Prevent duplicate include paths.
std::set<QString> seenPaths;
for (const HeaderPath &p : qAsConst(rawProjectPart.headerPaths)) {
const QString cleanPath = QDir::cleanPath(p.path);
if (seenPaths.insert(cleanPath).second)
part->headerPaths << HeaderPath(cleanPath, p.type);
}
part->precompiledHeaders = rawProjectPart.precompiledHeaders; part->precompiledHeaders = rawProjectPart.precompiledHeaders;
part->selectedForBuilding = rawProjectPart.selectedForBuilding; part->selectedForBuilding = rawProjectPart.selectedForBuilding;