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

CppTools: Reparse editor documents after active project change

Browse Source 
Change-Id: I010709c866291bf59c27f4a05765e1ab0efd28af
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-12-15 11:21:44 +01:00
parent bd66d5ac05
commit 602c873d3e
17 changed files with 88 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppprojectpartchooser.cpp
View File

@@ -43,7 +43,8 @@ ProjectPart::Ptr ProjectPartChooser::choose(const QString &filePath,
const ProjectPart::Ptr &currentProjectPart,
const ProjectPart::Ptr &manuallySetProjectPart,
bool stickToPreviousProjectPart,
const ProjectExplorer::Project *activeProject) const
const ProjectExplorer::Project *activeProject,
bool projectHasChanged) const
{
QTC_CHECK(m_projectPartsForFile);
QTC_CHECK(m_projectPartsFromDependenciesForFile);
@@ -69,8 +70,7 @@ ProjectPart::Ptr ProjectPartChooser::choose(const QString &filePath,
else
projectPart = selectFromActiveProject(projectParts, activeProject);
} else {
if (!projectParts.contains(projectPart))
// Apparently the project file changed, so update our project part.
if (projectHasChanged || !projectParts.contains(projectPart))
projectPart = selectFromActiveProject(projectParts, activeProject);
}