aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/artifact.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-07-05 12:53:35 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-07-05 13:30:58 +0000
commitacf4a4bd8cc8eabdbbe3c2e9fef1cd6728501ff3 (patch)
tree6e00b7c6f1b7bbca9c0d03c571d5fd00179febec /src/lib/corelib/buildgraph/artifact.h
parent768fc9c72e69f6a0843635bf71910c497d9f23ec (diff)
Remember which module properties were set explicitly on an artifact
... and consider these when updating the properties of generated artifacts during the change tracking process. This amends 768fc9c72e. Change-Id: Ifd3f6342fec8313b8cdd2e611734fc52a3810ae8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/artifact.h')
-rw-r--r--src/lib/corelib/buildgraph/artifact.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/artifact.h b/src/lib/corelib/buildgraph/artifact.h
index 7e37b1991..e4231c497 100644
--- a/src/lib/corelib/buildgraph/artifact.h
+++ b/src/lib/corelib/buildgraph/artifact.h
@@ -50,6 +50,9 @@
#include <QtCore/qstring.h>
+#include <utility>
+#include <vector>
+
namespace qbs {
namespace Internal {
class Logger;
@@ -92,6 +95,10 @@ public:
// the product.
FileTags pureFileTags;
+ // The properties attached directly to an artifact in an Artifact item or outputArtifacts
+ // script.
+ std::vector<std::pair<QStringList, QVariant>> pureProperties;
+
enum ArtifactType
{
Unknown = 1,