ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: disable re-pre-filling of indexed header paths for compilation database sourcegroups (issue #579)

Browse Source 
* disable re-pre-filling of indexed header paths if these are empty when showing settings of a cdb sourgroup
* fixed indexed header path were not regarded when deciding if project settings have been updated
This commit is contained in:
mlangkabel
2018-05-08 11:13:10 +02:00
parent 2d9b9a43de
commit e1df15a7b9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/settings/SourceGroupSettingsCxxCdb.cpp
+2 -1
View File
@@ -40,7 +40,8 @@ bool SourceGroupSettingsCxxCdb::equals(std::shared_ptr<SourceGroupSettings> othe
return (
otherCxxCdb &&
SourceGroupSettingsCxx::equals(other) &&
m_compilationDatabasePath == otherCxxCdb->m_compilationDatabasePath
m_compilationDatabasePath == otherCxxCdb->m_compilationDatabasePath &&
utility::isPermutation(m_indexedHeaderPaths, otherCxxCdb->m_indexedHeaderPaths)
);
}
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
-5
View File
@@ -334,11 +334,6 @@ void QtProjectWizzardContentPathsCDBHeader::load()
{
if (std::shared_ptr<SourceGroupSettingsCxxCdb> cdbSettings = std::dynamic_pointer_cast<SourceGroupSettingsCxxCdb>(m_settings))
{
if (cdbSettings->getIndexedHeaderPaths().empty())
{
cdbSettings->setIndexedHeaderPaths(getIndexedPathsDerivedFromCDB(cdbSettings));
}
m_list->setPaths(cdbSettings->getIndexedHeaderPaths());
}
}