diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-07 10:58:40 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-07 15:21:49 +0200 |
| commit | 0a70dce41160783c726f822eff81ae30b83acfdc (patch) | |
| tree | 94dcf0c2aa5995084dcfba9999c803ef883ea9bc /src/lib/buildgraph/buildgraph.cpp | |
| parent | 46dde94890f89299cbad4097d82fdb9051fbbcef (diff) | |
| download | qbs-0a70dce41160783c726f822eff81ae30b83acfdc.tar.gz | |
fix checkForPropertyChanges for product values
checkForPropertyChanges always returned true, because we stored tracked
product properties with the module name "product".
Introduce the enum Property::Kind instead of abusing the module name.
Task-number: QBS-305
Change-Id: I51a1eb28f0bb3245d7e926685f3a0fe01f981959
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/buildgraph/buildgraph.cpp')
| -rw-r--r-- | src/lib/buildgraph/buildgraph.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp index 6a049083f..b8ae692df 100644 --- a/src/lib/buildgraph/buildgraph.cpp +++ b/src/lib/buildgraph/buildgraph.cpp @@ -769,7 +769,9 @@ bool BuildGraphLoader::checkForPropertyChanges(const TransformerPtr &restoredTra PropertyFinder finder; foreach (const Property &property, restoredTrafo->modulePropertiesUsedInPrepareScript) { QVariant v; - if (property.value.type() == QVariant::List) { + if (property.kind == Property::PropertyInProduct) { + v = freshProduct->properties->value().value(property.propertyName); + } else if (property.value.type() == QVariant::List) { v = finder.propertyValues(freshProduct->properties->value(), property.moduleName, property.propertyName); } else { |