aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/artifactset.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-24 19:12:16 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-07-30 14:00:57 +0200
commitfd49db9b33c0f54255d92c0d882a4f18c20a5ef3 (patch)
treef01a43527e41bfced20f0fc77e2fe1ed3ee73d91 /src/lib/corelib/buildgraph/artifactset.h
parent472a0e505a78fddf5d7ce02b2c6ef8f859926b3e (diff)
fix calculation of old inputs for dynamic rules
Instead of deducing the old inputs of a rule from the inputs of its created transformers, we hold a dedicated list of old inputs, because the former approach doesn't work for dynamic rules. This fixes a speed regression introduced in 32c4d3d7. The outputArtifacts script of dynamic rules was always run on compatible inputs that were not input of transformers, e.g. C++ sources that don't have a Q_OBJECT macro. Change-Id: I2d43fa7c91ed9084bd27dc9b948c06152bfce726 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/artifactset.h')
-rw-r--r--src/lib/corelib/buildgraph/artifactset.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/artifactset.h b/src/lib/corelib/buildgraph/artifactset.h
index 092e9e8a2..696859649 100644
--- a/src/lib/corelib/buildgraph/artifactset.h
+++ b/src/lib/corelib/buildgraph/artifactset.h
@@ -44,6 +44,9 @@ public:
ArtifactSet();
ArtifactSet(const ArtifactSet &other);
ArtifactSet(const QSet<Artifact *> &other);
+
+ ArtifactSet &unite(const ArtifactSet &other);
+
static ArtifactSet fromNodeSet(const NodeSet &nodes);
static ArtifactSet fromNodeList(const QList<Artifact *> &lst);
};