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

CMake: Move builddirmanager into CMakeBuildConfiguration

Browse Source 
Change-Id: I1854b6021e7d573abd4ac9d64c8d5dbd0618ed71
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-05 15:56:03 +02:00
parent 8c34d653be
commit 338a7184a5
6 changed files with 161 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -194,6 +194,14 @@ bool BuildDirManager::isParsing() const
return m_reader && m_reader->isParsing();
}
void BuildDirManager::stopParsingAndClearState()
{
resetData();
if (m_reader)
m_reader->stop();
m_reader.reset();
}
void BuildDirManager::setParametersAndRequestParse(const BuildDirParameters &parameters,
int newReaderReparseOptions,
int existingReaderReparseOptions)
@@ -204,12 +212,10 @@ void BuildDirManager::setParametersAndRequestParse(const BuildDirParameters &par
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
return;
}
QTC_ASSERT(parameters.isValid(), return);
if (m_reader)
m_reader->stop();
QTC_ASSERT(parameters.isValid(), return );
BuildDirReader *old = m_reader.get();
stopParsingAndClearState();
m_parameters = parameters;
m_parameters.workDirectory = workDirectory(parameters);