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

QbsProjectManager: Remove duplicate include paths for the code model

Browse Source 
Task-number: QTCREATORBUG-17381
Change-Id: Iabf1cdfe7988181e0e20396c5a5ec02e51e27f44
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2017-01-20 11:30:49 +01:00
parent 68e5691047
commit 014167c8e8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -934,6 +934,7 @@ void QbsProject::updateCppCodeModel()
QLatin1String(CONFIG_INCLUDEPATHS)); QLatin1String(CONFIG_INCLUDEPATHS));
list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_SYSTEM_INCLUDEPATHS))); QLatin1String(CONFIG_SYSTEM_INCLUDEPATHS)));
list.removeDuplicates();
CppTools::ProjectPartHeaderPaths grpHeaderPaths; CppTools::ProjectPartHeaderPaths grpHeaderPaths;
foreach (const QString &p, list) foreach (const QString &p, list)
grpHeaderPaths += CppTools::ProjectPartHeaderPath( grpHeaderPaths += CppTools::ProjectPartHeaderPath(
@@ -944,6 +945,7 @@ void QbsProject::updateCppCodeModel()
QLatin1String(CONFIG_FRAMEWORKPATHS)); QLatin1String(CONFIG_FRAMEWORKPATHS));
list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_SYSTEM_FRAMEWORKPATHS))); QLatin1String(CONFIG_SYSTEM_FRAMEWORKPATHS)));
list.removeDuplicates();
foreach (const QString &p, list) foreach (const QString &p, list)
grpHeaderPaths += CppTools::ProjectPartHeaderPath( grpHeaderPaths += CppTools::ProjectPartHeaderPath(
FileName::fromUserInput(p).toString(), FileName::fromUserInput(p).toString(),