From b70637de4127d645e843098ebeffeafefc53aea0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 25 Sep 2017 19:08:47 +0200 Subject: [PATCH] QbsProjectManager: Fix project parsing Some recent ProjectExplorer refactorings caused the projects to stay in the parsing state indefinitely, making it impossible to build or run anything. Change-Id: I458a5560cc8d0c7c3183c0f104f00b073039f28e Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsproject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index f9f212fcb08..1d0121eab0e 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -142,12 +142,12 @@ QbsProject::QbsProject(const FileName &fileName) : connect(this, &Project::removedTarget, this, &QbsProject::targetWasRemoved); subscribeSignal(&BuildConfiguration::environmentChanged, this, [this]() { if (static_cast(sender())->isActive()) - startParsing(); + delayParsing(); }); connect(this, &Project::activeProjectConfigurationChanged, this, [this](ProjectConfiguration *pc) { if (pc && pc->isActive()) - startParsing(); + delayParsing(); }); connect(&m_parsingDelay, &QTimer::timeout, this, &QbsProject::startParsing); @@ -447,6 +447,7 @@ bool QbsProject::checkCancelStatus() qCDebug(qbsPmLog) << "Cancel request while parsing, starting re-parse"; m_qbsProjectParser->deleteLater(); m_qbsProjectParser = 0; + emitParsingFinished(false); parseCurrentBuildConfiguration(); return true; } @@ -537,7 +538,6 @@ void QbsProject::handleRuleExecutionDone() QTC_ASSERT(m_qbsProject.isValid(), return); m_projectData = m_qbsProject.projectData(); updateAfterParse(); - // finishParsing(true); } void QbsProject::targetWasAdded(Target *t)