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

CMake: Wire up the readers only once

Browse Source 
They can not get disconnected anymore, so just wire them up once.

Change-Id: I46af563e6aebe7bee00c813648bcbfab9967e766
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-10-08 12:37:44 +02:00
parent aa1cc54b3e
commit 3dcf14ea3f
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,20 +136,31 @@ void BuildDirManager::updateReaderType(const BuildDirParameters &p,
std::function<void()> todo) std::function<void()> todo)
{ {
if (!m_reader || !m_reader->isCompatible(p)) { if (!m_reader || !m_reader->isCompatible(p)) {
qCDebug(cmakeBuildDirManagerLog) << "Creating new reader"; if (m_reader) {
stopParsingAndClearState();
qCDebug(cmakeBuildDirManagerLog) << "Creating new reader do to incompatible parameters";
} else {
qCDebug(cmakeBuildDirManagerLog) << "Creating first reader";
}
m_reader = BuildDirReader::createReader(p); m_reader = BuildDirReader::createReader(p);
connect(m_reader.get(),
&BuildDirReader::configurationStarted,
this,
&BuildDirManager::parsingStarted);
connect(m_reader.get(),
&BuildDirReader::dataAvailable,
this,
&BuildDirManager::emitDataAvailable);
connect(m_reader.get(),
&BuildDirReader::errorOccured,
this,
&BuildDirManager::emitErrorOccured);
connect(m_reader.get(), &BuildDirReader::dirty, this, &BuildDirManager::becameDirty);
connect(m_reader.get(), &BuildDirReader::isReadyNow, this, todo);
} }
QTC_ASSERT(m_reader, return); QTC_ASSERT(m_reader, return );
connect(m_reader.get(), &BuildDirReader::configurationStarted,
this, &BuildDirManager::parsingStarted);
connect(m_reader.get(), &BuildDirReader::dataAvailable,
this, &BuildDirManager::emitDataAvailable);
connect(m_reader.get(), &BuildDirReader::errorOccured,
this, &BuildDirManager::emitErrorOccured);
connect(m_reader.get(), &BuildDirReader::dirty, this, &BuildDirManager::becameDirty);
connect(m_reader.get(), &BuildDirReader::isReadyNow, this, todo);
m_reader->setParameters(p); m_reader->setParameters(p);
} }