diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-02 14:43:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-02 16:39:58 +0200 |
| commit | f6d51902d414414c20befe87575138c10cb6b6eb (patch) | |
| tree | 87d2e657b4852e145fa5bf5dfb6e90d6532a97f6 /src/lib/buildgraph | |
| parent | b04a049c13c543e786120764cd9b6f78cbd7b86a (diff) | |
| download | qbs-f6d51902d414414c20befe87575138c10cb6b6eb.tar.gz | |
Do not ever set up build data for disabled products.
This currently happens when we add a new disabled product and a build
graph already exists.
Change-Id: I71825cf9057493a178d484c988eb06258ab89dbf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph')
| -rw-r--r-- | src/lib/buildgraph/buildgraph.cpp | 2 | ||||
| -rw-r--r-- | src/lib/buildgraph/projectbuilddata.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp index c336ad7b0..5534fe5fa 100644 --- a/src/lib/buildgraph/buildgraph.cpp +++ b/src/lib/buildgraph/buildgraph.cpp @@ -417,6 +417,8 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, con CycleDetector cycleDetector(logger); cycleDetector.visitProduct(product); const ProductBuildData * const buildData = product->buildData.data(); + if (logger.traceEnabled()) + logger.qbsTrace() << "enabled: " << product->enabled << "; build data: " << buildData; QBS_CHECK(!!product->enabled == !!buildData); if (!product->enabled) return; diff --git a/src/lib/buildgraph/projectbuilddata.cpp b/src/lib/buildgraph/projectbuilddata.cpp index a8798edf5..1e28a4afa 100644 --- a/src/lib/buildgraph/projectbuilddata.cpp +++ b/src/lib/buildgraph/projectbuilddata.cpp @@ -237,8 +237,10 @@ void BuildDataResolver::resolveProductBuildDataForExistingProject(const TopLevel const QList<ResolvedProductPtr> &freshProducts) { m_project = project; - foreach (const ResolvedProductPtr &product, freshProducts) - resolveProductBuildData(product); + foreach (const ResolvedProductPtr &product, freshProducts) { + if (product->enabled) + resolveProductBuildData(product); + } } void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &product) |