From 9e6d470c3ae4922ff582e41ed18e796c1bb90537 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 28 Sep 2016 12:09:35 +0200 Subject: [PATCH] QbsProjectManager: Do not execute rules on initial project loading The "rule execution only" type of build can lead to nasty bugs due to scanners getting called for files that don't exist yet. This effectively reverts a57e75884e. Task-number: QBS-1021 Change-Id: I85e7559060112428f8cd5872b95619ac26979743 Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsproject.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 0dd29a79211..297e38dee07 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -483,22 +483,6 @@ void QbsProject::handleQbsParsingDone(bool success) m_qbsUpdateFutureInterface->reportCanceled(); } - bool hasTargetArtifacts = false; - if (dataChanged) { - qCDebug(qbsPmLog) << "Project data changed."; - foreach (const qbs::ProductData &product, m_projectData.allProducts()) { - if (!product.targetArtifacts().isEmpty()) { - hasTargetArtifacts = true; - break; - } - } - if (!hasTargetArtifacts) { - qCDebug(qbsPmLog) << "No target artifacts present, executing rules"; - m_qbsProjectParser->startRuleExecution(); - return; - } - } - m_qbsProjectParser->deleteLater(); m_qbsProjectParser = 0; m_qbsUpdateFutureInterface->reportFinished();