diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-24 15:10:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-24 16:28:04 +0200 |
| commit | c6ecdbdbe84f24eb7ba9c1acb780339edf007624 (patch) | |
| tree | ea3aa1b2a834fd3ecea79197bb3c2a5860da0d54 /src/lib/buildgraph/automoc.cpp | |
| parent | 3104e3053dbff443122165d28ff12b5e14e0cdac (diff) | |
| download | qbs-c6ecdbdbe84f24eb7ba9c1acb780339edf007624.tar.gz | |
Improve handling of changes to restored build graph.
Instead of painstakingly inserting new product pointers into an existing
build graph, do it the other way around and put existing build data into
the newly resolved project. This is much more robust.
Change-Id: If38e4a5e14c6a5faedb0c590e86aa5efc7844e39
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/automoc.cpp')
| -rw-r--r-- | src/lib/buildgraph/automoc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/buildgraph/automoc.cpp b/src/lib/buildgraph/automoc.cpp index b81444a55..6c750a307 100644 --- a/src/lib/buildgraph/automoc.cpp +++ b/src/lib/buildgraph/automoc.cpp @@ -344,7 +344,7 @@ void AutoMoc::unmoc(Artifact *artifact, const FileTag &mocFileTag) m_logger.qbsTrace() << "[AUTOMOC] removing moc obj artifact " << relativeArtifactFileName(mocObjArtifact); } - artifact->topLevelProject()->buildData->removeArtifact(mocObjArtifact, m_logger); + artifact->topLevelProject->buildData->removeArtifact(mocObjArtifact, m_logger); } } @@ -352,7 +352,7 @@ void AutoMoc::unmoc(Artifact *artifact, const FileTag &mocFileTag) m_logger.qbsTrace() << "[AUTOMOC] removing generated artifact " << relativeArtifactFileName(generatedMocArtifact); } - artifact->topLevelProject()->buildData->removeArtifact(generatedMocArtifact, m_logger); + artifact->topLevelProject->buildData->removeArtifact(generatedMocArtifact, m_logger); delete generatedMocArtifact; } |