1 files changed, 46 insertions, 1 deletions

diff --git a/src/lib/language/language.h b/src/lib/language/language.h
index 183a79e44..0af4cb621 100644
--- a/src/lib/language/language.h
+++ b/src/lib/language/language.h
@@ -61,6 +61,7 @@ QT_END_NAMESPACE
 namespace qbs {
 namespace Internal {
 class BuildGraphLoader;
+class BuildGraphVisitor;
 
 class FileTagger : public PersistentObject
 {
@@ -86,6 +87,45 @@ private:
     FileTags m_fileTags;
 };
 
+class TagScanner : public PersistentObject
+{
+public:
+    static TagScannerPtr create() { return TagScannerPtr(new TagScanner); }
+
+    void init(const CodeLocation &location, const QString &name, const FileTags &inTags,
+            const FileTags &outTags, const ScriptFunctionConstPtr &scanScript)
+    {
+        m_location = location;
+        m_name = name;
+        m_inputTags = inTags;
+        m_outputTags = outTags;
+        m_scanScript = scanScript;
+    }
+
+    const CodeLocation &location() const { return m_location; }
+    const QString &name() const { return m_name; }
+    const FileTags &inputTags() const { return m_inputTags; }
+    const FileTags &outputTags() const { return m_outputTags; }
+    const ScriptFunctionConstPtr &scanScript() const { return m_scanScript; }
+
+    void setDependencies(const QList<TagScannerConstPtr> &deps) { m_dependencies = deps; }
+    const QList<TagScannerConstPtr> &dependencies() const { return m_dependencies; }
+
+private:
+    TagScanner()
+    {}
+
+    void load(PersistentPool &pool);
+    void store(PersistentPool &pool) const;
+
+    CodeLocation m_location;
+    QString m_name;
+    FileTags m_inputTags;
+    FileTags m_outputTags;
+    ScriptFunctionConstPtr m_scanScript;
+    QList<TagScannerConstPtr> m_dependencies;
+};
+
 class RuleArtifact : public PersistentObject
 {
 public:
@@ -142,7 +182,7 @@ inline bool operator!=(const SourceArtifact &sa1, const SourceArtifact &sa2) {
     return !(sa1 == sa2);
 }
 
-bool sourceArtifactListsAreEqual(const QList<SourceArtifactPtr> &l1,
+bool sourceArtifactSetsAreEqual(const QList<SourceArtifactPtr> &l1,
                                  const QList<SourceArtifactPtr> &l2);
 
 class SourceWildCards : public PersistentObject
@@ -354,6 +394,7 @@ public:
     QSet<RulePtr> rules;
     QSet<ResolvedProductPtr> dependencies;
     QList<FileTaggerConstPtr> fileTaggers;
+    QList<TagScannerConstPtr> tagScanners;
     QList<ResolvedModuleConstPtr> modules;
     QList<ResolvedTransformerConstPtr> transformers;
     QList<GroupPtr> groups;
@@ -364,6 +405,7 @@ public:
     mutable QProcessEnvironment runEnvironment; // must not be saved
     QHash<QString, QString> executablePathCache;
 
+    void accept(BuildGraphVisitor *visitor) const;
     QList<SourceArtifactPtr> allFiles() const;
     QList<SourceArtifactPtr> allEnabledFiles() const;
     FileTags fileTagsForFileName(const QString &fileName) const;
@@ -394,6 +436,8 @@ public:
     QList<ResolvedProjectPtr> subProjects;
     WeakPointer<ResolvedProject> parentProject;
 
+    virtual void accept(BuildGraphVisitor *visitor) const;
+
     void setProjectProperties(const QVariantMap &config) { m_projectProperties = config; }
     const QVariantMap &projectProperties() const { return m_projectProperties; }
 
@@ -432,6 +476,7 @@ public:
 
     QSet<QString> buildSystemFiles;
 
+    void accept(BuildGraphVisitor *visitor) const;
     void setBuildConfiguration(const QVariantMap &config);
     const QVariantMap &buildConfiguration() const { return m_buildConfiguration; }
     QString id() const { return m_id; }