diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-11-13 11:53:28 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-11-13 13:33:37 +0100 |
| commit | 8fda8170392236ded89e54b2717d077fdd287dff (patch) | |
| tree | 0811e000bca42176c986e53a2d7d503dd235ee01 /src/lib/buildgraph/executor.h | |
| parent | fad7c5c967c771aaaea0a3df180cfb823b5d17d0 (diff) | |
| download | qbs-8fda8170392236ded89e54b2717d077fdd287dff.tar.gz | |
make Executor::m_leaves an ordinary list
There's no need to maintain a set of leaves. If we encounter a leaf
that's already built, just skip over it.
Along the way:
- Rename Executor::execute to Executor::buildArtifact.
- Fix style of output parameters.
Change-Id: Iab105a5bbc475cc347f228bb81941a1f737a7705
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/buildgraph/executor.h')
| -rw-r--r-- | src/lib/buildgraph/executor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h index cc5efcbdf..2f9f9b437 100644 --- a/src/lib/buildgraph/executor.h +++ b/src/lib/buildgraph/executor.h @@ -95,7 +95,7 @@ private: void initLeaves(const QList<Artifact *> &changedArtifacts); void initLeavesTopDown(Artifact *artifact, QSet<Artifact *> &seenArtifacts); bool run(); - void execute(Artifact *artifact); + void buildArtifact(Artifact *artifact); void finishArtifact(Artifact *artifact); void finish(); void initializeArtifactsState(); @@ -118,7 +118,7 @@ private: BuildResult m_buildResult; QList<BuildProduct::Ptr> m_productsToBuild; QList<Artifact *> m_roots; - QMap<Artifact *, QHashDummyValue> m_leaves; + QList<Artifact *> m_leaves; ScanResultCache m_scanResultCache; InputArtifactScannerContext *m_inputArtifactScanContext; AutoMoc *m_autoMoc; |
