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

CMake: Make BuildDirManager a bit more robust

Browse Source 
Handle error situations better.

Change-Id: I1376e2ef72f6e599779a0bf692e2c0dfee85724b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Tobias Hunger
2019-10-08 12:43:56 +02:00
parent fc4459a585
commit 4d2211aa46
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,6 +238,8 @@ void BuildDirManager::stopParsingAndClearState()
{
qCDebug(cmakeBuildDirManagerLog) << "stopping parsing run!";
if (m_reader) {
if (m_reader->isParsing())
m_reader->errorOccured(tr("Parsing has been canceled."));
disconnect(m_reader.get(), nullptr, this, nullptr);
m_reader->stop();
}
@@ -329,7 +331,8 @@ void BuildDirManager::parse()
{
qCDebug(cmakeBuildDirManagerLog) << "parsing!";
QTC_ASSERT(m_parameters.isValid(), return );
QTC_ASSERT(m_reader, return);
QTC_ASSERT(m_reader, return );
QTC_ASSERT(!m_reader->isParsing(), return );
m_reader->stop();