diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
| commit | 187c114987572f5492722b4d66b76366e3e50365 (patch) | |
| tree | bc2bff3a99b333433f09537bc0b9c5fc709057e0 /src/lib/corelib/buildgraph/buildgraphloader.cpp | |
| parent | 6144279d346670130e0ecdfaf789beaa44cd6755 (diff) | |
| parent | adc28c434853cf0fa17e95cc207e5a1c6eb761de (diff) | |
Merge 1.9 into master
Change-Id: I6da76b0a53bf87105c4e7b48724d9760cb68e831
Diffstat (limited to 'src/lib/corelib/buildgraph/buildgraphloader.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index 7af5eca2c..ba0e11430 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -1044,7 +1044,7 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore const ChildrenInfo &childrenInfo = childLists.value(oldArtifact); for (Artifact * const child : qAsConst(childrenInfo.children)) { rad.children << RescuableArtifactData::ChildData(child->product->name, - child->product->profile, child->filePath(), + child->product->multiplexConfigurationId, child->filePath(), childrenInfo.childrenAddedByScanner.contains(child)); } newlyResolvedProduct->buildData->rescuableArtifactData.insert( |