summaryrefslogtreecommitdiff
path: root/src/lib/buildgraph/buildgraphloader.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-08-12 15:16:44 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-08-14 10:35:06 +0200
commitccef982e7771dfd80c548918221956a1daa6385a (patch)
treeb98316fe48ed3ff3414bd0c1f29e79a024f4a5e6 /src/lib/buildgraph/buildgraphloader.cpp
parent8038d00ab5a83dc40747595700d9751534007625 (diff)
downloadqbs-ccef982e7771dfd80c548918221956a1daa6385a.tar.gz
Treat a product file the same way as other build system files...
... when doing change tracking after restoring a build graph. Changes in one product can influence properties in other products via the surrounding project. Change-Id: I4294b326280e676939de9533309fdfa9146f9e92 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/buildgraphloader.cpp')
-rw-r--r--src/lib/buildgraph/buildgraphloader.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp
index fbaeae2b4..67d645a44 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/buildgraph/buildgraphloader.cpp
@@ -173,12 +173,10 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters &paramet
// can make the list of source files in a product change without the respective file
// having been touched. In such a case, the build data for that product will have to be set up
// anew.
- bool allProductsPotentiallyChanged = false;
if (hasBuildSystemFileChanged(buildSystemFiles, buildGraphTimeStamp)
|| hasEnvironmentChanged(restoredProject)
|| hasFileExistsResultChanged(restoredProject)) {
reResolvingNecessary = true;
- allProductsPotentiallyChanged = true;
}
if (!reResolvingNecessary)
@@ -214,8 +212,7 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters &paramet
}
}
- if (allProductsPotentiallyChanged)
- checkAllProductsForChanges(allRestoredProducts, freshProductsByName, changedProducts);
+ checkAllProductsForChanges(allRestoredProducts, freshProductsByName, changedProducts);
foreach (const ResolvedProductPtr &product, changedProducts) {
ResolvedProductPtr freshProduct = freshProductsByName.value(product->name);
if (!freshProduct)